bootstrap: use `-d .git` to check whether we are in a git tree.

* gl/build-aux/bootstrap.in (func_require_git): .git is not a
regular file, use -d to check its existence.
* bootstrap: Regenerate.
* THANKS: Add Bruce Korb.
Reported by Bruce Korb

Copyright-paperwork-exempt: Yes
Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/THANKS b/THANKS
index de0cfded57272cd1461fa137aba4dab9cac65816..63d3ea2eab76fc38291332cbb0a581959ccd3420 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -78,6 +78,7 @@
   Brad Smith                   brad@comstyle.com
   Brent Leback                 brent.leback@st.com
   Brian Barrett                        brbarret@osl.iu.edu
+  Bruce Korb                   bruce.korb@gmail.com
   Bruno Haible                 haible@ilog.fr
   Brice De Bruyne              bricedb@gmail.com
   Camilo La Rota               camilo.larota@ens-lyon.fr

diff --git a/bootstrap b/bootstrap
index 2094e73ad733aada1bced45f1f3c5706dc45add4..4e24dbf44709e29731b03f3ea743d6eaadc5a54a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2563,7 +2563,7 @@ test extract-trace = "$progname" && func_main "$@"
 # End:
 
 # Set a version string for *this* script.
-scriptversion=2014-01-04.01; # UTC
+scriptversion=2014-01-27.02; # UTC
 
 
 ## ------------------- ##
@@ -3698,7 +3698,7 @@ func_require_git ()
     $opt_skip_git && GIT=true
 
     test true = "$GIT" || {
-      if test -f .git; then
+      if test -d .git; then
         ($GIT --version) >/dev/null 2>&1 || GIT=true
       fi
     }

diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 8441bdc6270662a5770fa6ff7297a81dbb646d52..d0276f609f9a452c6be9ab483a3b9592b89a1d90 100755 (executable)
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -232,7 +232,7 @@ vc_ignore=
 . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace"
 
 # Set a version string for *this* script.
-scriptversion=2014-01-04.01; # UTC
+scriptversion=2014-01-27.02; # UTC
 
 
 ## ------------------- ##
@@ -1367,7 +1367,7 @@ func_require_git ()
     $opt_skip_git && GIT=true
 
     test true = "$GIT" || {
-      if test -f .git; then
+      if test -d .git; then
         ($GIT --version) >/dev/null 2>&1 || GIT=true
       fi
     }