Mercurial > octave

changeset 28554:7a17dfa7716d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bootstrap: Merge back local changes removed in f00e92f9e85b.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 10 Jul 2020 08:34:33 +0200
parents aa47120a505d
children 24f43782e04c 26fd670f776a
files bootstrap
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap	Fri Jul 10 00:31:10 2020 -0400
+++ b/bootstrap	Fri Jul 10 08:34:33 2020 +0200
@@ -670,6 +670,11 @@
         || 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
     ;;