From a8aec7fc37c2ae6211957ed357b07bdfe0e1670f Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Thu, 23 Apr 2020 04:21:23 -0500
Subject: [PATCH] If we can't just push it after a fast-forward merge,
 something is wrong. Don't assume it's all fine.

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

diff --git a/templates/merger.xml b/templates/merger.xml
index e483921..ea0dfe7 100644
--- a/templates/merger.xml
+++ b/templates/merger.xml
@@ -58,10 +58,10 @@ cd {{ NAME }}
 git checkout {{ DEFAULT_BRANCH }}
 git checkout -b {{ PACKAGING_BRANCH_S }} || git checkout {{ PACKAGING_BRANCH_S }}
 git merge --ff-only {{ DEFAULT_BRANCH }}
-git push --set-upstream origin {{ PACKAGING_BRANCH_S }} || echo "cannot push"
+git push --set-upstream origin {{ PACKAGING_BRANCH_S }}
 git checkout -b {{ PACKAGING_BRANCH_U }} || git checkout {{ PACKAGING_BRANCH_U }}
 git merge --ff-only {{ PACKAGING_BRANCH_S }}
-git push --set-upstream origin {{ PACKAGING_BRANCH_U }} || echo "cannot push"
+git push --set-upstream origin {{ PACKAGING_BRANCH_U }}
       </command>
     </hudson.tasks.Shell>
   </builders>