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>

diff --git a/ChangeLog b/ChangeLog
index 327d3d2964323be7ca765c86e2f52e59781600a4..fa879e924e7bcaee19fdfe09fa4d5eedfa8425f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-20  Andreas Gruenbacher  <agruen@suse.de>
+
+       * build-aux/bootstrap: 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.  Grep for the full option name
+       in the summary, too.
+
 2010-04-19  Bruno Haible  <bruno@clisp.org>
 
        relocatable: Drop the need to define RELOCATABLE_STRIP in Makefile.am.

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 365a3d92eae8aa7d795ca997ca04146c94102bc2..9686baaadf43564d689221c9b032cbc7c758cb42 100755 (executable)
--- 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 $?