From 1183d5ebfef96603df1217e3ae3a94506b89ce26 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 23 Jan 2022 18:10:11 +0100 Subject: gnulib: update --- bootstrap | 22 +++++++++++++++++++--- gnulib | 2 +- lib/.gitignore | 2 ++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/bootstrap b/bootstrap index 63e76dee..9535aecc 100755 --- a/bootstrap +++ b/bootstrap @@ -4,7 +4,7 @@ scriptversion=2021-04-11.09; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2021 Free Software Foundation, Inc. +# Copyright (C) 2003-2022 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 @@ -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 4bdc327d..71f29a9f 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 4bdc327dbda59dcdbfa0f983a4f35c4a4ec3578c +Subproject commit 71f29a9f4673e76e2bef19471a2f35cfa312d99e diff --git a/lib/.gitignore b/lib/.gitignore index 374ccdd9..fac66ae4 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -371,7 +371,9 @@ /stdint.in.h /stdio--.h /stdio-impl.h +/stdio-read.c /stdio-safer.h +/stdio-write.c /stdio.h /stdio.in.h /stdlib.h -- cgit v1.2.1