From: Andrew Tridgell Date: Sun, 3 Oct 2010 14:53:45 +0000 (-0700) Subject: autobuild: override the editor when marking the commit X-Git-Tag: samba-4.0.0alpha14~2380 X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=4b16cc9eef62171a7df276ec88064084147e2f8f 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 Autobuild-Date: Sun Oct 3 15:22:01 UTC 2010 on sn-devel-104 --- diff --git a/script/autobuild.py b/script/autobuild.py index a0c2d9f4e66..b639c601ed3 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)