upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-04-28 06:33:36 +00:00
Code Activity

bootstrap: Improve installation of git-merge-changelog driver.

Browse Source 
Suggested by Basil L. Contovounesios <basil@contovou.net> 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.
This commit is contained in:
Bruno Haible
2025-11-12 15:03:00 +01:00
parent 5586a5fc76
commit 1ae6e5fa59
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2025-11-12 Bruno Haible <bruno@clisp.org>
bootstrap: Improve installation of git-merge-changelog driver.
Suggested by Basil L. Contovounesios <basil@contovou.net> 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.
2025-11-12 Basil L. Contovounesios <basil@contovou.net>
do-release-commit-and-tag: Accommodate alternative NEWS formats.

4
build-aux/bootstrap
View File

@@ -37,7 +37,7 @@ medir=`dirname "$me"`
# 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.
#
@@ -861,7 +861,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

4
top/bootstrap-funclib.sh
View File

@@ -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