Mercurial > octave

annotate build-aux/gnulib-bootstrap-git-fetch.diff @ 31225:3eab70385569

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sparse-xpow.cc: Use faster multiplication technique, this time for complex
author Arun Giridhar <arungiridhar@gmail.com>
date Sun, 11 Sep 2022 13:53:38 -0400
parents a3df57fa5c5d
children e98fb9b4be86
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29627
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 Update bootstrap script from upstream gnulib to automatically fetch from repository if needed
29628
a3df57fa5c5d Remove DOS line endings in cset f114b45ebbc9.
Rik <rik@octave.org>
parents: 29627
diff changeset
2
a3df57fa5c5d Remove DOS line endings in cset f114b45ebbc9.
Rik <rik@octave.org>
parents: 29627
diff changeset
3 See also: https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00150.html
29627
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 diff --git a/bootstrap b/bootstrap
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 index 8f76d6962..2d0a06376 100755
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 --- a/bootstrap
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 +++ b/bootstrap
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 @@ -670,6 +670,11 @@ if $use_gnulib; then
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 || cleanup_gnulib
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12 trap - 1 2 13 15
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 +
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 + elif test -n "$GNULIB_REVISION" \
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 + && ! git --git-dir="$gnulib_path"/.git cat-file \
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 + commit "$GNULIB_REVISION"; then
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 + git --git-dir="$gnulib_path"/.git fetch
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 fi
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 GNULIB_SRCDIR=$gnulib_path
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 ;;
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 @@ -704,6 +709,10 @@ if $use_gnulib; then
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 && ! git_modules_config submodule.gnulib.url >/dev/null; then
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 + if ! git --git-dir="$GNULIB_SRCDIR"/.git cat-file \
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 + commit "$GNULIB_REVISION"; then
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 + git --git-dir="$GNULIB_SRCDIR"/.git fetch
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 + fi
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 fi
f114b45ebbc9 bootstrap: Add diff and instructions for local changes after gnulib update.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31