Basil L. Contovounesios wrote:
> > [merge "merge-changelog"]
> > name = GNU-style ChangeLog merge driver
> > - driver = /usr/local/bin/git-merge-changelog %O %A %B
> > + driver = /usr/local/bin/git-merge-changelog %O %A %B "%Y"
>
> Would it make sense for build-aux/bootstrap to include the same, or is
> Git 2.44 still too new for this to be on by default?
It makes sense, yes. If a git version < 2.44 is in use, the line
&& strcmp (other_conflict_label, "%Y") != 0
will make sure that git-merge-changelog ignores the fourth argument.
2025-11-12 Bruno Haible <[email protected]>
bootstrap: Improve installation of git-merge-changelog driver.
Suggested by Basil L. Contovounesios <[email protected]> in
<https://lists.gnu.org/archive/html/bug-gnulib/2025-11/msg00122.html>.
* top/bootstrap-funclib.sh (autopull): Pass a 4th argument to
git-merge-changelog.
* build-aux/bootstrap: Regenerated.
diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh
index 0ed5be464e..a71edffa80 100644
--- a/top/bootstrap-funclib.sh
+++ b/top/bootstrap-funclib.sh
@@ -1,6 +1,6 @@
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2025-09-07.23; # UTC
+scriptlibversion=2025-11-12.14; # UTC
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
#
@@ -824,7 +824,7 @@ autopull()
elif check_exists git-merge-changelog; then
echo "$0: initializing git-merge-changelog driver"
git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
- git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+ git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B
"%Y"'
else
echo "$0: consider installing git-merge-changelog from gnulib"
fi
