Mercurial > hg > octave-nkf > gnulib-hg
changeset 17771:4c77a02af6ab
bootstrap: only update the gnulib submodule
* build-aux/bootstrap: Restrict the "submodule update" command
to the gnulib path.
Reported by Reuben Thomas
| author | Pádraig Brady <P@draigBrady.com> |
|---|---|
| date | Thu, 23 Oct 2014 13:26:23 +0100 |
| parents | a0a111d28e75 |
| children | c51106dc54a3 |
| files | ChangeLog build-aux/bootstrap |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-10-23 Pádraig Brady <P@draigBrady.com> + + bootstrap: only update the gnulib submodule + * build-aux/bootstrap: Restrict the "submodule update" command + to the gnulib path. + 2014-10-18 Paul Eggert <eggert@cs.ucla.edu> symlinkat: port to AIX 7.1
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -598,8 +598,8 @@ # Note that $use_git is necessarily true in this case. if git_modules_config submodule.gnulib.url >/dev/null; then echo "$0: getting gnulib files..." - git submodule init || exit $? - git submodule update || exit $? + git submodule init -- "$gnulib_path" || exit $? + git submodule update -- "$gnulib_path" || exit $? elif [ ! -d "$gnulib_path" ]; then echo "$0: getting gnulib files..." @@ -628,13 +628,14 @@ # This fallback allows at least git 1.5.5. if test -f "$gnulib_path"/gnulib-tool; then # Since file already exists, assume submodule init already complete. - git submodule update || exit $? + git submodule update -- "$gnulib_path" || exit $? else # Older git can't clone into an empty directory. rmdir "$gnulib_path" 2>/dev/null git clone --reference "$GNULIB_SRCDIR" \ "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ - && git submodule init && git submodule update \ + && git submodule init -- "$gnulib_path" \ + && git submodule update -- "$gnulib_path" \ || exit $? fi fi