diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-03 07:53:45 -0700 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-10-03 15:22:01 +0000 |
| commit | 4b16cc9eef62171a7df276ec88064084147e2f8f (patch) | |
| tree | 2e55f8e9bf192913fca4135c331d83896107f00a /script | |
| parent | 120f5ee429eabc84a36434854fb0a194cc1312e1 (diff) | |
| download | samba-4b16cc9eef62171a7df276ec88064084147e2f8f.tar.gz | |
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@samba.org>
Autobuild-Date: Sun Oct 3 15:22:01 UTC 2010 on sn-devel-104
Diffstat (limited to 'script')
| -rwxr-xr-x | script/autobuild.py | 3 |
1 files changed, 2 insertions, 1 deletions
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) |