[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] maint: update gnulib to latest
From: |
Bernhard Voelker |
Subject: |
[PATCH 2/3] maint: update gnulib to latest |
Date: |
Thu, 6 Jan 2022 16:47:39 +0100 |
Run 'make update-gnulib-to-latest', mainly due to:
> license: fix GPLv3 texts to use a comma instead of semicolon.
* bootstrap: Sync from gnulib/build-aux/bootstrap.
* gnulib: Update to latest.
---
bootstrap | 20 ++++++++++++++++++--
gnulib | 2 +-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/bootstrap b/bootstrap
index 96588618..9535aecc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -763,9 +763,25 @@ if $use_gnulib; then
shallow=
if test -z "$GNULIB_REVISION"; then
git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+ git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
+ || cleanup_gnulib
+ else
+ git fetch -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+ mkdir -p "$gnulib_path"
+ # 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 needed to
+ # be processed, which can drastically reduce download and processing
+ # time for checkout. If the fetch by commit fails, a shallow fetch can
+ # not be performed because we do not know what the depth of the commit
+ # is without fetching all commits. So fallback to fetching all commits.
+ git -C "$gnulib_path" init
+ git -C "$gnulib_path" remote add origin
${GNULIB_URL:-$default_gnulib_url}
+ git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" \
+ || git -C "$gnulib_path" fetch origin \
+ || cleanup_gnulib
+ git -C "$gnulib_path" reset --hard FETCH_HEAD
fi
- git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
- || cleanup_gnulib
trap - 1 2 13 15
fi
diff --git a/gnulib b/gnulib
index 75541c6a..035ce56a 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 75541c6adaf6fc45541a35d2c8803b9b68f2a7fc
+Subproject commit 035ce56a3353b00d34dbbb338580ff25fb7ef767
--
2.34.1