Create CI branches if they don't already exist.

6 years ago · 7d3aa8f9ae
parent 61466cbda4
commit 7d3aa8f9ae
1 changed files with 2 additions and 2 deletions
--- a/templates/merger.xml
+++ b/templates/merger.xml
@ -53,9 +53,9 @@
      <command>
 cd {{ NAME }}
 git checkout {{ DEFAULT_BRANCH }}
-git checkout {{ PACKAGING_BRANCH }}
+git checkout -b {{ PACKAGING_BRANCH }} || git checkout {{ PACKAGING_BRANCH }}
 git merge --ff-only {{ DEFAULT_BRANCH }}
-git push origin {{ PACKAGING_BRANCH }}
+git push --set-upstream origin {{ PACKAGING_BRANCH }}
      </command>
    </hudson.tasks.Shell>
  </builders>