diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-22 18:00:32 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-22 20:35:15 -0400 |
| commit | 75aba5a746aa34dcc8e29eb043fdafd2104f6639 (patch) | |
| tree | 96d97453fdf42bd627be2cfb6681f40b46907c04 | |
| parent | 4cf4dcb8b31274a8dfba6bae3a6826a1b521da3f (diff) | |
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>
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 96fb2780291..34a725f5349 100644 --- a/Makefile.am +++ b/Makefile.am | |||
| @@ -1167,7 +1167,8 @@ cuirass-jobs: $(GOBJECTS) | |||
| 1167 | 1167 | ||
| 1168 | .git/config: etc/git/gitconfig | 1168 | .git/config: etc/git/gitconfig |
| 1169 | $(AM_V_at)if command -v git >/dev/null && test -d .git; then \ | 1169 | $(AM_V_at)if command -v git >/dev/null && test -d .git; then \ |
| 1170 | git config --add include.path ../etc/git/gitconfig; \ | 1170 | git config --fixed-value --replace-all include.path \ |
| 1171 | ../etc/git/gitconfig ../etc/git/gitconfig; | ||
| 1171 | fi | 1172 | fi |
| 1172 | 1173 | ||
| 1173 | COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= | 1174 | COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= |