summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-09-30 14:42:02 -0700
committerAndrew Tridgell <tridge@samba.org>2010-09-30 22:25:02 +0000
commit6a029cd9ca662863724920030bb3a325cee28691 (patch)
treeaeed2ade3a3f1294e3ab08a578a17e1baadc5c96 /script
parent176ecce9a661c9145620c3f7af9d13025ed0616c (diff)
downloadsamba-6a029cd9ca662863724920030bb3a325cee28691.tar.gz
samba-6a029cd9ca662863724920030bb3a325cee28691.tar.bz2
samba-6a029cd9ca662863724920030bb3a325cee28691.zip
autobuild: push of ref/notes/commits isn't allowed in master
metze may enable this later Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Thu Sep 30 22:25:02 UTC 2010 on sn-devel-104
Diffstat (limited to 'script')
-rwxr-xr-xscript/autobuild.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index 62cef69197..f1e29a7a83 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -270,7 +270,9 @@ def rebase_tree(url):
def push_to(url):
print("Pushing to %s" % url)
if options.mark:
- run_cmd("EDITOR=script/commit_mark.sh git notes edit HEAD", dir=test_master)
+ run_cmd("EDITOR=script/commit_mark.sh 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)
run_cmd("git push pushto +HEAD:master", show=True, dir=test_master)