mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 20:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source 
* 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 5facdbb291)

* bpo-30232: Regenerate configure (#1396)

Run autoconf.
(cherry picked from commit 9ed34a8953)
This commit is contained in:
Victor Stinner 2017-05-02 23:46:06 +02:00 • committed by GitHub
parent 3c422b9265
commit 4dae0d111d
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

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

2
configure.ac
View file

@ -29,7 +29,7 @@ AC_SUBST(GITVERSION)
AC_SUBST(GITTAG) AC_SUBST(GITTAG)
AC_SUBST(GITBRANCH) AC_SUBST(GITBRANCH)
if test -e $srcdir/.git/HEAD if test -e $srcdir/.git
then then
AC_CHECK_PROG(HAS_GIT, git, found, not-found) AC_CHECK_PROG(HAS_GIT, git, found, not-found)
else else