summaryrefslogtreecommitdiff
path: root/build-aux/bootstrap
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2014-10-23 13:26:23 +0100
committerPádraig Brady <P@draigBrady.com>2014-10-23 13:28:38 +0100
commite94cfb19c8d84a09cd2827ec2f75222c6e854781 (patch)
treead870f9a6d39b8b90cdc9fbd73d4c1a44ba1b4bb /build-aux/bootstrap
parent032bd151051bfdcb7387af627342ae85637e3253 (diff)
downloadgnulib-e94cfb19c8d84a09cd2827ec2f75222c6e854781.tar.gz
bootstrap: only update the gnulib submodule
* build-aux/bootstrap: Restrict the "submodule update" command to the gnulib path. Reported by Reuben Thomas
Diffstat (limited to 'build-aux/bootstrap')
-rwxr-xr-xbuild-aux/bootstrap9
1 files changed, 5 insertions, 4 deletions
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index ce90bc419f..5dbd1b14c0 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -598,8 +598,8 @@ case ${GNULIB_SRCDIR--} in
# 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 @@ case ${GNULIB_SRCDIR--} in
# 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