diff --git a/bootstrap b/bootstrap index 6542faaf..3dac6440 100755 --- a/bootstrap +++ b/bootstrap @@ -3,7 +3,7 @@ scriptversion=2025-06-10.02; # UTC -# Copyright (C) 2003-2025 Free Software Foundation, Inc. +# Copyright (C) 2003-2026 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bootstrap-funclib.sh b/bootstrap-funclib.sh index 3bedf367..8a0116a7 100644 --- a/bootstrap-funclib.sh +++ b/bootstrap-funclib.sh @@ -1,6 +1,6 @@ # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2025-06-10.02; # UTC +scriptlibversion=2025-12-04.19; # UTC # Copyright (C) 2003-2026 Free Software Foundation, Inc. # @@ -35,7 +35,7 @@ export LC_ALL # Honor $PERL, but work even if there is none. PERL="${PERL-perl}" -default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git +default_gnulib_url=https://https.git.savannah.gnu.org/git/gnulib.git # Copyright year, for the --version output. copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'` @@ -824,7 +824,8 @@ 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