[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  beb0181 buildtools: fix --git-local-changes option
      from  75508ce Turns out there are lots of places in S3 where token passed in here can be NULL (become_root() sets the current security token to NULL for example). Ensure we don't crash.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit beb01815f041d678024c60ac9ca53f8fcf759246
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 2 01:58:10 2010 +0100

    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 at samba.org>
    Autobuild-Date: Thu Dec  2 09:09:21 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_version.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index df71584..076615b 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()


-- 
Samba Shared Repository