From 75aba5a746aa34dcc8e29eb043fdafd2104f6639 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 22 Oct 2023 18:00:32 -0400
Subject: build: Avoid git config 'include' duplicates.

* Makefile.am (.git/config): Invoke git config --replace-all with a
value-pattern instead of --add.

Change-Id: Id6e19b15d3772105128eb9b48d0f4e039ae3d988
Reported-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 96fb278029..34a725f534 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1167,7 +1167,8 @@ cuirass-jobs: $(GOBJECTS)
 
 .git/config: etc/git/gitconfig
 	$(AM_V_at)if command -v git >/dev/null && test -d .git; then \
-	git config --add include.path ../etc/git/gitconfig; \
+	git config --fixed-value --replace-all include.path \
+	  ../etc/git/gitconfig ../etc/git/gitconfig;
 	fi
 
 COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg=
-- 
cgit v1.2.3