Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-08-08 10:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: propagate gnulib changes

Browse Source
This commit is contained in:
Paul Eggert
2026-07-21 12:52:53 -07:00
parent 720943cff0
commit 7024830c72
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap
+1 -1
View File
@@ -3,7 +3,7 @@
scriptversion=2025-06-10.02; # UTC 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 # 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 # it under the terms of the GNU General Public License as published by
bootstrap-funclib.sh
+4 -3
View File
@@ -1,6 +1,6 @@
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap. # 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. # Copyright (C) 2003-2026 Free Software Foundation, Inc.
# #
@@ -35,7 +35,7 @@ export LC_ALL
# Honor $PERL, but work even if there is none. # Honor $PERL, but work even if there is none.
PERL="${PERL-perl}" 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, for the --version output.
copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'` copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'`
@@ -824,7 +824,8 @@ autopull()
elif check_exists git-merge-changelog; then elif check_exists git-merge-changelog; then
echo "$0: initializing git-merge-changelog driver" echo "$0: initializing git-merge-changelog driver"
git config merge.merge-changelog.name 'GNU-style ChangeLog merge 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 else
echo "$0: consider installing git-merge-changelog from gnulib" echo "$0: consider installing git-merge-changelog from gnulib"
fi fi