]> granicus.if.org Git - icinga2/commitdiff
Update the pick.py script
authorGunnar Beutner <gunnar.beutner@netways.de>
Wed, 20 Apr 2016 16:40:22 +0000 (18:40 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 20 Apr 2016 16:41:17 +0000 (18:41 +0200)
refs #11623

pick.py

diff --git a/pick.py b/pick.py
index fb037f4b53c72dfeb0f8ece0881181ff67512cf9..869d9b40f5a9b0061dbd3b0730d5caae75122617 100755 (executable)
--- a/pick.py
+++ b/pick.py
@@ -82,10 +82,12 @@ while True:
 
 repo = Repo(".")
 
-new_branch = repo.create_head("auto-merged-" + version_name, "support/" + ".".join(version_name.split(".")[:-1]))
+repo.git.fetch()
+
+new_branch = repo.create_head("auto-merged-" + version_name, "origin/support/" + ".".join(version_name.split(".")[:-1]))
 new_branch.checkout()
 
-commits = reversed(list(repo.iter_commits(rev="master")))
+commits = reversed(list(repo.iter_commits(rev="origin/master")))
 
 tmpEditor = NamedTemporaryFile()