[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: build: Avoid git config 'include' duplicates.
|
From: |
guix-commits |
|
Subject: |
02/02: build: Avoid git config 'include' duplicates. |
|
Date: |
Sun, 22 Oct 2023 20:36:48 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 75aba5a746aa34dcc8e29eb043fdafd2104f6639
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 22 18:00:32 2023 -0400
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(-)
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=