From beb01815f041d678024c60ac9ca53f8fcf759246 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 2 Dec 2010 01:58:10 +0100 Subject: 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 Autobuild-Date: Thu Dec 2 09:09:21 CET 2010 on sn-devel-104 --- buildtools/wafsamba/samba_version.py | 1 + 1 file changed, 1 insertion(+) 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() -- cgit