[2.7] bpo-30411: Use --git-dir instead of -C to make git work under version below...

(cherry picked from commit 4c8555773a801f957297132a92c0acb382d640e4)

diff --git a/configure b/configure
index a75ca3a0f5c9f2bfb718d1dc20a2956b7590bbb6..03b73c6f1356414d3eaf96b62d4ce29fb189f825 100755 (executable)
--- a/configure
+++ b/configure
@@ -5791,9 +5791,9 @@ HAS_GIT=no-repository
 fi
 if test $HAS_GIT = found
 then
-    GITVERSION="git -C \$(srcdir) rev-parse --short HEAD"
-    GITTAG="git -C \$(srcdir) describe --all --always --dirty"
-    GITBRANCH="git -C \$(srcdir) name-rev --name-only HEAD"
+    GITVERSION="git --git-dir \$(srcdir)/.git rev-parse --short HEAD"
+    GITTAG="git --git-dir \$(srcdir)/.git describe --all --always --dirty"
+    GITBRANCH="git --git-dir \$(srcdir)/.git name-rev --name-only HEAD"
 else
     GITVERSION=""
     GITTAG=""

diff --git a/configure.ac b/configure.ac
index 36625f7b82a34366ae0e0ec1a0bb9f976bc11cf9..257c8eb21e54e82c5ac09b2a64464823087463eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1005,9 +1005,9 @@ HAS_GIT=no-repository
 fi
 if test $HAS_GIT = found
 then
-    GITVERSION="git -C \$(srcdir) rev-parse --short HEAD"
-    GITTAG="git -C \$(srcdir) describe --all --always --dirty"
-    GITBRANCH="git -C \$(srcdir) name-rev --name-only HEAD"
+    GITVERSION="git --git-dir \$(srcdir)/.git rev-parse --short HEAD"
+    GITTAG="git --git-dir \$(srcdir)/.git describe --all --always --dirty"
+    GITBRANCH="git --git-dir \$(srcdir)/.git name-rev --name-only HEAD"
 else
     GITVERSION=""
     GITTAG=""