tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the pick.py script 

refs #11623
This commit is contained in:
Gunnar Beutner 2016-04-20 18:40:22 +02:00
parent 0963344940
commit f8a4144198
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pick.py
View File

@ -82,10 +82,12 @@ while True:
repo = Repo(".") 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() new_branch.checkout()
commits = reversed(list(repo.iter_commits(rev="master"))) commits = reversed(list(repo.iter_commits(rev="origin/master")))
tmpEditor = NamedTemporaryFile() tmpEditor = NamedTemporaryFile()