summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-04-20 00:30:51 +0200
committerJim Meyering <meyering@redhat.com>2010-04-20 07:30:54 +0200
commitcea53ef6ee1a91cb4a56fae2652b43c830bd2f08 (patch)
treec0f9959fe7b79cd8dffa510b31c13ba1c5df7375 /build-aux
parent2f31750d4a1c829278bfc49e619d67f02a376491 (diff)
downloadgnulib-cea53ef6ee1a91cb4a56fae2652b43c830bd2f08.tar.gz
bootstrap: use "git -h" instead of "git --help"
Use "git -h" for testing for supported options instead of "git --help". The short-form option only shows a summary, and doesn't layout the full man page, which is much faster and saves a dependency. (We found out that git uses man in a build environment of http://hydra.nixos.org/, which by default doesn't have man installed.) Grep for the full option name in the summary, too. Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/bootstrap4
1 files changed, 2 insertions, 2 deletions
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 365a3d92ea..9686baaadf 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -424,7 +424,7 @@ case ${GNULIB_SRCDIR--} in
trap cleanup_gnulib 1 2 13 15
- git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow=
+ git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow=
git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
cleanup_gnulib
@@ -437,7 +437,7 @@ case ${GNULIB_SRCDIR--} in
if test -d "$GNULIB_SRCDIR"/.git && \
git_modules_config submodule.gnulib.url >/dev/null; then
echo "$0: getting gnulib files..."
- if git submodule --help|grep reference > /dev/null; then
+ if git submodule -h|grep -- --reference > /dev/null; then
# Prefer the one-liner available in git 1.6.4 or newer.
git submodule update --init --reference "$GNULIB_SRCDIR" \
"$gnulib_path" || exit $?