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

vstinner · web-flow · commit 360fb81367bb · 2017-05-03T00:06:17.000+02:00
* 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 5facdbb) * bpo-30232: Regenerate configure (#1396) Run autoconf. (cherry picked from commit 9ed34a8) (cherry picked from commit 4dae0d1)
diff --git 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
@@ -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
