view build-aux/gnulib-bootstrap-git-fetch.diff @ 31390:2c037ce00450 stable release-7-3-0

Version 7.3.0 released. * configure.ac (AC_INIT): Set version to 7.3.0. (OCTAVE_MINOR_VERSION): Now 3. (OCTAVE_PATCH_VERSION): Now 0. (OCTAVE_RELEASE_DATE): Set to "2022-11-02". * org.octave.Octave.appdata.xml: Add release info for version 7.3.0. * CITATION: Update for 7.3.0. * NEWS.7.md: Update release date.
author John W. Eaton <jwe@octave.org>
date Wed, 02 Nov 2022 14:19:56 -0400
parents a3df57fa5c5d
children e98fb9b4be86
line wrap: on
line source

Update bootstrap script from upstream gnulib to automatically fetch from repository if needed

See also: https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00150.html

diff --git a/bootstrap b/bootstrap
index 8f76d6962..2d0a06376 100755
--- a/bootstrap
+++ b/bootstrap
@@ -670,6 +670,11 @@ if $use_gnulib; then
         || cleanup_gnulib
 
       trap - 1 2 13 15
+
+    elif test -n "$GNULIB_REVISION" \
+         && ! git --git-dir="$gnulib_path"/.git cat-file \
+              commit "$GNULIB_REVISION"; then
+      git --git-dir="$gnulib_path"/.git fetch
     fi
     GNULIB_SRCDIR=$gnulib_path
     ;;
@@ -704,6 +709,10 @@ if $use_gnulib; then
 
   if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
      && ! git_modules_config submodule.gnulib.url >/dev/null; then
+    if ! git --git-dir="$GNULIB_SRCDIR"/.git cat-file \
+         commit "$GNULIB_REVISION"; then
+      git --git-dir="$GNULIB_SRCDIR"/.git fetch
+    fi
     (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
   fi