From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 20 Apr 2016 16:40:22 +0000 (+0200)
Subject: Update the pick.py script
X-Git-Tag: v2.5.0~367
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8a4144198c6a18fe1292fd420f0f8997513aa2c;p=icinga2

Update the pick.py script

refs #11623
---

diff --git a/pick.py b/pick.py
index fb037f4b5..869d9b40f 100755
--- 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()