diff --git a/bootstrap b/bootstrap index fbbf76f..fef3cbc 100755 --- a/bootstrap +++ b/bootstrap @@ -37,7 +37,7 @@ medir=`dirname "$me"` # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2025-01-26.03; # UTC +scriptlibversion=2025-02-16.12; # UTC # Copyright (C) 2003-2025 Free Software Foundation, Inc. # @@ -580,17 +580,11 @@ prepare_GNULIB_SRCDIR () || cleanup_gnulib else # GNULIB_REFDIR is not set or not usable. Ignore it. - shallow= + shallow='--depth 2' if test -z "$GNULIB_REVISION"; then - if git clone -h 2>&1 | grep -- --depth > /dev/null; then - shallow='--depth 2' - fi git clone $shallow "$gnulib_url" "$gnulib_path" \ || cleanup_gnulib else - if git fetch -h 2>&1 | grep -- --depth > /dev/null; then - shallow='--depth 2' - fi # Only want a shallow checkout of $GNULIB_REVISION, but git does not # support cloning by commit hash. So attempt a shallow fetch by # commit hash to minimize the amount of data downloaded and changes @@ -601,7 +595,10 @@ prepare_GNULIB_SRCDIR () # to fetching all commits. # $GNULIB_REVISION can be a commit id, a tag name, or a branch name. mkdir -p "$gnulib_path" - git -C "$gnulib_path" init + # Use a -c option to silence an annoying message + # "hint: Using 'master' as the name for the initial branch." + # (cf. ). + git -C "$gnulib_path" -c init.defaultBranch=master init git -C "$gnulib_path" remote add origin "$gnulib_url" if git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" then diff --git a/gnulib b/gnulib index 553ab92..3773db6 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 553ab924d2b68d930fae5d3c6396502a57852d23 +Subproject commit 3773db653242ab7165cd300295c27405e4f9cc79