From 4b16cc9eef62171a7df276ec88064084147e2f8f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 3 Oct 2010 07:53:45 -0700 Subject: autobuild: override the editor when marking the commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- script/autobuild.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/autobuild.py b/script/autobuild.py index a0c2d9f4e6..b639c601ed 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) -- cgit