Skip to content

Commit 4dae0d1

Browse files
authored
[3.6] bpo-30232: Support Git worktree in configure.ac (#1398)
* 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)
1 parent 3c422b9 commit 4dae0d1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2711,7 +2711,7 @@ fi
27112711

27122712

27132713

2714-
if test -e $srcdir/.git/HEAD
2714+
if test -e $srcdir/.git
27152715
then
27162716
# Extract the first word of "git", so it can be a program name with args.
27172717
set dummy git; ac_word=$2

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ AC_SUBST(GITVERSION)
2929
AC_SUBST(GITTAG)
3030
AC_SUBST(GITBRANCH)
3131

32-
if test -e $srcdir/.git/HEAD
32+
if test -e $srcdir/.git
3333
then
3434
AC_CHECK_PROG(HAS_GIT, git, found, not-found)
3535
else

0 commit comments

Comments
 (0)