branch master updated: Makefile.am: Use --add flag to "git config".

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 7f8575c97a Makefile.am: Use --add flag to "git config".
7f8575c97a is described below

commit 7f8575c97a8c112e9f82981b8803d075a82738dd
Author: Mekeor Melire <mekeor@posteo.de>
AuthorDate: Sun May 7 10:43:41 2023 +0000

    Makefile.am: Use --add flag to "git config".
    
    Without the "--add" flag to "git config include.path ...", the command fails
    if the user already has a configuration entry of "include.path".
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 8af69f88ac..13718e4353 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1121,7 +1121,7 @@ cuirass-jobs: $(GOBJECTS)
 
 .git/config: etc/git/gitconfig
        $(AM_V_at)if command -v git >/dev/null && test -d .git; then \
-       git config include.path ../etc/git/gitconfig; \
+       git config --add include.path ../etc/git/gitconfig; \
        fi
 
 nodist_noinst_DATA = .git/hooks/pre-push .git/config