Mercurial > octave

changeset 29500:5fad0c81f7db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bootstrap: Revert local change removed in hg id 0cf53a415b7f. * bootstrap: Revert code and add explanatory comment.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 07 Apr 2021 08:04:04 +0200
parents f152b41862d9
children 220c6c4a3533
files bootstrap
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap	Tue Apr 06 13:59:40 2021 -0700
+++ b/bootstrap	Wed Apr 07 08:04:04 2021 +0200
@@ -686,6 +686,15 @@
       git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \
         || cleanup_gnulib
 
+    elif test -n "$GNULIB_REVISION" \
+         && ! git --git-dir="$gnulib_path"/.git cat-file \
+              commit "$GNULIB_REVISION"; then
+      # This is a local change in GNU Octave to allow automatic updates.
+      # This change has not (yet) been accepted upstream. Manually merge it
+      # when updating gnulib.
+      # See: https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00150.html
+      git --git-dir="$gnulib_path"/.git fetch
+
       trap - 1 2 13 15
     fi
     GNULIB_SRCDIR=$gnulib_path