From 7d3aa8f9ae439a2d6b4ee280b438abba204a98c7 Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Sat, 30 Mar 2019 16:39:34 -0500
Subject: [PATCH] Create CI branches if they don't already exist.

---
 templates/merger.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/merger.xml b/templates/merger.xml
index 03f2176..adfdc53 100644
--- 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>