autobuild: override the editor when marking the commit
authorAndrew Tridgell <tridge@samba.org>
Sun, 3 Oct 2010 14:53:45 +0000 (07:53 -0700)
committerGünther Deschner <gd@samba.org>
Sun, 3 Oct 2010 15:22:01 +0000 (15:22 +0000)
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@samba.org>
Autobuild-Date: Sun Oct  3 15:22:01 UTC 2010 on sn-devel-104

script/autobuild.py

index a0c2d9f4e664bd9cd3fc76cc8ca60914f7403294..b639c601ed3650cb54810072a67a5182c9705aac 100755 (executable)
@@ -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)