Work on build-tarball: Refactor customization of git URLs.

Author: bhaible

.github/workflows/bsd.yml

@@ -50,9 +50,6 @@ on:
 env:
   package: libtool
   branch: development
-  # URL suitable for 'git clone'
-  #gnulib_url: https://git.savannah.gnu.org/git/gnulib.git
-  gnulib_url: https://github.com/coreutils/gnulib.git
 
 jobs:
   build-tarball:

.github/workflows/linux.yml

@@ -50,9 +50,6 @@ on:
 env:
   package: libtool
   branch: development
-  # URL suitable for 'git clone'
-  #gnulib_url: https://git.savannah.gnu.org/git/gnulib.git
-  gnulib_url: https://github.com/coreutils/gnulib.git
 
 jobs:
   build-tarball:

.github/workflows/macos.yml

@@ -51,9 +51,6 @@ on:
 env:
   package: libtool
   branch: development
-  # URL suitable for 'git clone'
-  #gnulib_url: https://git.savannah.gnu.org/git/gnulib.git
-  gnulib_url: https://github.com/coreutils/gnulib.git
 
 jobs:
   build-tarball:

.github/workflows/many-platforms.yml

@@ -50,9 +50,6 @@ on:
 env:
   package: libtool
   branch: development
-  # URL suitable for 'git clone'
-  #gnulib_url: https://git.savannah.gnu.org/git/gnulib.git
-  gnulib_url: https://github.com/coreutils/gnulib.git
   # URL prefix suitable for downloading individual files through 'wget'
   #gnulib_url_prefix: https://gitweb.git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=
   gnulib_url_prefix: https://raw.githubusercontent.com/coreutils/gnulib/refs/heads/master/

.github/workflows/solaris.yml

@@ -50,9 +50,6 @@ on:
 env:
   package: libtool
   branch: development
-  # URL suitable for 'git clone'
-  #gnulib_url: https://git.savannah.gnu.org/git/gnulib.git
-  gnulib_url: https://github.com/coreutils/gnulib.git
 
 jobs:
   build-tarball:

.github/workflows/windows.yml

@@ -50,9 +50,6 @@ on:
 env:
   package: libtool
   branch: development
-  # URL suitable for 'git clone'
-  #gnulib_url: https://git.savannah.gnu.org/git/gnulib.git
-  gnulib_url: https://github.com/coreutils/gnulib.git
   # URL prefix suitable for downloading individual files through 'wget'
   #gnulib_url_prefix: https://gitweb.git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;hb=HEAD;f=
   gnulib_url_prefix: https://raw.githubusercontent.com/coreutils/gnulib/refs/heads/master/

build-dev-tarball.sh

@@ -29,14 +29,16 @@ fi
 
 set -e
 
+. ./init-git.sh
+
 # Fetch sources (uses package 'git').
 # The depth here needs to be at least 2, because the number of commits in the
 # git history of HEAD is stored as "serial" number in m4/ltversion.m4, and if
 # it is not at least 2 the unit test
 #   libtoolize.at: "14: verbatim aclocal.m4 w/o AC_CONFIG_MACRO_DIRS"
 # fails.
 git clone --depth 2 -b "$branch" https://git.savannah.gnu.org/git/"$package".git
-git clone --depth 1 "${gnulib_url}"
+git clone --depth 1 https://git.savannah.gnu.org/git/gnulib.git
 
 # Apply patches.
 (cd "$package" && patch -p1 < ../patches/Skip-test-option-parser.sh-for-ksh-shell-on-NetBSD.patch)

build-tarball.sh

@@ -29,20 +29,16 @@ fi
 
 set -e
 
-# Improve efficiency of checkout of git submodules.
-git config --global url.git://git.savannah.gnu.org/.insteadof git://git.git.savannah.gnu.org/
-git config --global url.https://git.savannah.gnu.org/git/.insteadof https://https.git.savannah.gnu.org/git/
-git config --global url.git://git.savannah.gnu.org/gnulib.git.insteadof https://github.com/coreutils/gnulib.git
-git config --global url.https://git.savannah.gnu.org/git/gnulib.git.insteadof https://github.com/coreutils/gnulib.git
+. ./init-git.sh
 
 # Fetch sources (uses package 'git').
 # The depth here needs to be at least 2, because the number of commits in the
 # git history of HEAD is stored as "serial" number in m4/ltversion.m4, and if
 # it is not at least 2 the unit test
 #   libtoolize.at: "14: verbatim aclocal.m4 w/o AC_CONFIG_MACRO_DIRS"
 # fails.
-git clone --depth 2 -b "$branch" https://https.git.savannah.gnu.org/git/"$package".git
-git clone --depth 1 "${gnulib_url}"
+git clone --depth 2 -b "$branch" https://git.savannah.gnu.org/git/"$package".git
+git clone --depth 1 https://git.savannah.gnu.org/git/gnulib.git
 
 # Apply patches.
 (cd "$package" && patch -p1 < ../patches/Skip-test-option-parser.sh-for-ksh-shell-on-NetBSD.patch)

init-git.sh

@@ -0,0 +1,8 @@
+# Mapping from canonical git server URLs to more efficient read-only mirrors.
+# See
+# https://git-scm.com/docs/git-config#Documentation/git-config.txt-urlltbasegtinsteadOf
+# https://git-scm.com/docs/git-clone#_git_urls
+git config set --global --append url.git://git.git.savannah.gnu.org/.insteadOf git://git.savannah.gnu.org/
+git config set --global --append url.https://https.git.savannah.gnu.org/git/.insteadOf https://git.savannah.gnu.org/git/
+git config set --global --append url.https://github.com/coreutils/gnulib.git.insteadOf git://git.savannah.gnu.org/gnulib.git
+git config set --global --append url.https://github.com/coreutils/gnulib.git.insteadOf https://git.savannah.gnu.org/git/gnulib.git