From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 2 May 2017 22:06:17 +0000 (+0200)
Subject: [3.5] bpo-30232: Support Git worktree in configure.ac (#1398) (#1401)
X-Git-Tag: v3.5.4rc1~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=360fb81367bb409bb7a1d261d88fcf82cee528f0;p=thirdparty%2FPython%2Fcpython.git

[3.5] bpo-30232: Support Git worktree in configure.ac (#1398) (#1401)

* bpo-30232: Support Git worktree in configure.ac (#1391)

Don't test if .git/HEAD file exists, but only if the .git file (or
directory) exists.
(cherry picked from commit 5facdbb29169c2799c42f887cef4cd9d087b0167)

* bpo-30232: Regenerate configure (#1396)

Run autoconf.
(cherry picked from commit 9ed34a89532763cf89f5e11fffb91ef7dee29fed)

(cherry picked from commit 4dae0d111dd7bb34ec730eea2327a3219acff211)
---

diff --git a/configure b/configure
index f5fe5f459c39..a6d83f266008 100755
--- a/configure
+++ b/configure
@@ -2840,7 +2840,7 @@ fi
 
 
 
-if test -e $srcdir/.git/HEAD
+if test -e $srcdir/.git
 then
 # Extract the first word of "git", so it can be a program name with args.
 set dummy git; ac_word=$2
diff --git a/configure.ac b/configure.ac
index 21284d016845..22ac805a66a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_SUBST(GITVERSION)
 AC_SUBST(GITTAG)
 AC_SUBST(GITBRANCH)
 
-if test -e $srcdir/.git/HEAD
+if test -e $srcdir/.git
 then
 AC_CHECK_PROG(HAS_GIT, git, found, not-found)
 else