diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-12-02 01:58:10 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-12-02 09:09:21 +0100 |
| commit | beb01815f041d678024c60ac9ca53f8fcf759246 (patch) | |
| tree | a2993bd77c15b5a64a674d27ecd5383007bf6d5f | |
| parent | 75508cea4a95ea63a1a4c192c82e827a712aa709 (diff) | |
| download | samba-beb01815f041d678024c60ac9ca53f8fcf759246.tar.gz samba-beb01815f041d678024c60ac9ca53f8fcf759246.tar.bz2 samba-beb01815f041d678024c60ac9ca53f8fcf759246.zip | |
buildtools: fix --git-local-changes option
If we set the GIT_DIR envvar we also need to set GIT_WORK_TREE,
otherwise we can't expect valid output from 'git diff HEAD'.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Dec 2 09:09:21 CET 2010 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_version.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index df715840cb..076615b6c4 100644 --- a/buildtools/wafsamba/samba_version.py +++ b/buildtools/wafsamba/samba_version.py @@ -50,6 +50,7 @@ def git_version_summary(path, env=None): return ("GIT-UNKNOWN", {}) os.putenv('GIT_DIR', '%s/.git' % path) + os.putenv('GIT_WORK_TREE', path) git = Utils.cmd_output(env.GIT + ' show --pretty=format:"%h%n%ct%n%H%n%cd" --stat HEAD', silent=True) lines = git.splitlines() |