summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-12 18:27:46 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-12 18:38:21 +0000
commite4eba98f831b869bf3894c2940a8131a7a6862be (patch)
treeacb9d84078f4919611b2d801cf9bc714565129c6
parent8d07e6d986322c4954a385b9bfea73f0931b3053 (diff)
downloadsamba-e4eba98f831b869bf3894c2940a8131a7a6862be.tar.gz
samba-e4eba98f831b869bf3894c2940a8131a7a6862be.tar.bz2
samba-e4eba98f831b869bf3894c2940a8131a7a6862be.zip
waf/samba_version: Simplify git show command.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Fri Nov 12 18:38:21 UTC 2010 on sn-devel-104
-rw-r--r--buildtools/wafsamba/samba_version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index ef3b39a1f9..69f36eb4e1 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -49,7 +49,7 @@ def git_version_summary(path, have_git):
if not have_git:
return ("GIT-UNKNOWN", {})
- git = Utils.cmd_output('GIT_DIR=%s/.git git show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD' % path)
+ git = Utils.cmd_output(env={"GIT_DIR": "%s/.git" % path}, cmd=["git", "show", '--pretty=format:%h%n%ct%n%H%n%cd', "--stat", "HEAD"])
lines = git.splitlines()
fields = {