[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  4b16cc9 autobuild: override the editor when marking the commit
      from  120f5ee wafsamba: Some reformatting.

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


- Log -----------------------------------------------------------------
commit 4b16cc9eef62171a7df276ec88064084147e2f8f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Sun Oct 3 07:53:45 2010 -0700

    autobuild: override the editor when marking the commit
    
    this avoids the problem of a user having an editor set in their global
    .gitconfig, and that having higher precedence than the EDITOR
    environment variable
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Sun Oct  3 15:22:01 UTC 2010 on sn-devel-104

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

Summary of changes:
 script/autobuild.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index a0c2d9f..b639c60 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -289,7 +289,8 @@ def rebase_tree(url):
 def push_to(url):
     print("Pushing to %s" % url)
     if options.mark:
-        run_cmd("EDITOR=script/commit_mark.sh git commit --amend -c HEAD", dir=test_master)
+        run_cmd("git config --replace-all core.editor script/commit_mark.sh", dir=test_master)
+        run_cmd("git commit --amend -c HEAD", dir=test_master)
         # the notes method doesn't work yet, as metze hasn't allowed refs/notes/* in master
         # run_cmd("EDITOR=script/commit_mark.sh git notes edit HEAD", dir=test_master)
     run_cmd("git remote add -t master pushto %s" % url, show=True, dir=test_master)


-- 
Samba Shared Repository