From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 15 Jan 2014 07:10:29 +0000 (+1300)
Subject: bootstrap: check for git checkout correctly.
X-Git-Tag: v2.4.3~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64367d3499ec323af2e18326996c8c73924eab50;p=thirdparty%2Flibtool.git

bootstrap: check for git checkout correctly.

* gl/bulid-aux/bootstrap.in (func_require_git): Use .git instead
of .gitignore to recognise a git checkout.
* bootstrap: Regenerate.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/bootstrap b/bootstrap
index db3125562..2094e73ad 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3698,8 +3698,8 @@ func_require_git ()
     $opt_skip_git && GIT=true
 
     test true = "$GIT" || {
-      if test -f .gitignore && ($GIT --version) >/dev/null 2>&1; then :; else
-      GIT=true
+      if test -f .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 71ff3aefe..8441bdc62 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -1367,8 +1367,8 @@ func_require_git ()
     $opt_skip_git && GIT=true
 
     test true = "$GIT" || {
-      if test -f .gitignore && ($GIT --version) >/dev/null 2>&1; then :; else
-      GIT=true
+      if test -f .git; then
+        ($GIT --version) >/dev/null 2>&1 || GIT=true
       fi
     }