Mercurial > octave

view build-aux/gnulib-bootstrap-git-fetch.diff @ 30243:a4061ae5ff79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use UTF-8 file API if supported by HDF5 library. * m4/acinclude.m4 (OCTAVE_CHECK_HDF5_HAS_UTF8_API): Add test to check if HDF5 library uses UTF-8 file API on Windows (version 1.12 or newer). * configure.ac (HDF5): Run new configure test. * libinterp/corefcn/ls-hdf5.cc (hdf5_fstreambase::open_create), libinterp/corefcn/load-save.cc (load_save_system::get_file_format, load_save_system::save): The kludge that was used to work with non-ASCII characters in HDF5 file names can be removed if the used version of HDF5 supports UTF-8 encoded file names.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 19 Oct 2021 14:26:04 +0200
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