Mercurial > octave
annotate build-aux/gnulib-bootstrap-git-fetch.diff @ 31054:201e29541ef5 stable
NEWS.7.md: Clarify whitespace rules with inplace and binary operators (bug #62552).
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 02 Jun 2022 14:47:55 +0200 |
parents | a3df57fa5c5d |
children | e98fb9b4be86 |
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 |