From 1ec9cc839d0d1452efbb192f121a3bda25d13104 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 4 Feb 2025 02:00:19 +0100 Subject: [PATCH] bootstrap: Remove undesired output. * top/bootstrap-funclib.sh (prepare_GNULIB_SRCDIR): Silence the initial branch hint. * build-aux/bootstrap: Regenerated. --- ChangeLog | 7 +++++++ build-aux/bootstrap | 7 +++++-- top/bootstrap-funclib.sh | 7 +++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6604f7fcec..a5fdf782e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2025-02-03 Bruno Haible + + bootstrap: Remove undesired output. + * top/bootstrap-funclib.sh (prepare_GNULIB_SRCDIR): Silence the initial + branch hint. + * build-aux/bootstrap: Regenerated. + 2025-02-03 Paul Eggert c-vasnprintf: pacify -Wswitch-enum diff --git a/build-aux/bootstrap b/build-aux/bootstrap index fbbf76f578..2d174cedbd 100755 --- a/build-aux/bootstrap +++ b/build-aux/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-04.01; # UTC # Copyright (C) 2003-2025 Free Software Foundation, Inc. # @@ -601,7 +601,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/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh index ba53114017..1ad3d85a41 100644 --- a/top/bootstrap-funclib.sh +++ b/top/bootstrap-funclib.sh @@ -1,6 +1,6 @@ # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2025-01-26.03; # UTC +scriptlibversion=2025-02-04.01; # UTC # Copyright (C) 2003-2025 Free Software Foundation, Inc. # @@ -564,7 +564,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 -- 2.39.5