build: update gnulib to latest; and bootstrap

This commit is contained in:
Jim Meyering 2026-01-02 17:28:28 -08:00
parent f14b8ae84d
commit 7954732488
2 changed files with 6 additions and 5 deletions

View File

@ -5,7 +5,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
@ -37,9 +37,9 @@ medir=`dirname "$me"`
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
scriptlibversion=2025-09-07.23; # UTC
scriptlibversion=2025-12-04.19; # 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
@ -861,7 +861,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

2
gnulib

@ -1 +1 @@
Subproject commit 862a81c0e15448adde6a6e7473ec47e3a4bd91a6
Subproject commit 4f6ac2c3c689cd7312b5f9da97791b14bbc2ee53