summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2017-03-21 04:35:08 (GMT)
committerGitHub <noreply@github.com>2017-03-21 04:35:08 (GMT)
commite9213d929d7b0075539e87416f6a6fb86c27454b (patch)
tree3e39b85a9483adbe1fc7b527856c75223c904286 /configure
parentfcd79ada4e4cf335372538b34c8eb89cf09f84b2 (diff)
downloadcpython-e9213d929d7b0075539e87416f6a6fb86c27454b.zip
cpython-e9213d929d7b0075539e87416f6a6fb86c27454b.tar.gz
cpython-e9213d929d7b0075539e87416f6a6fb86c27454b.tar.bz2
bpo-27593: Revise git SCM build info. (#744) (#745)
Use --short form of git hash. Use output from "git describe" for tag. Expected outputs: 1. previous hg 2. previous git 3. updated git Release (tagged) build: 1. Python 3.7.0a0 (v3.7.0a0:4def2a2901a5, ... 2. Python 3.7.0a0 (v3.7.0a0^0:05f53735c8912f8df1077e897f052571e13c3496, ... 3. Python 3.7.0a0 (v3.7.0a0:05f53735c8, ... Development build: 1. Python 3.7.0a0 (default:41df79263a11, ... 2. Python 3.7.0a0 (master:05f53735c8912f8df1077e897f052571e13c3496, ... 3. Python 3.7.0a0 (heads/master-dirty:05f53735c8, ... "dirty" means the working tree has uncommitted changes. See "git help describe" for more info. (cherry picked from commit 554626ada769abf82a5dabe6966afa4265acb6a6)
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index d4eccb1..abe1dc5 100755
--- a/configure
+++ b/configure
@@ -2743,8 +2743,8 @@ HAS_GIT=no-repository
fi
if test $HAS_GIT = found
then
- GITVERSION="git -C \$(srcdir) rev-parse HEAD"
- GITTAG="git -C \$(srcdir) name-rev --tags --name-only HEAD"
+ 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"
else
GITVERSION=""