From e5d7d1a109a576eed000135656a27cf16c139e9d Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Mon, 27 Feb 2023 10:53:12 +0100
Subject: [PATCH] Improving merge script
---
bin/merge | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/bin/merge b/bin/merge
index 86104be..6053e31 100755
--- a/bin/merge
+++ b/bin/merge
@@ -28,10 +28,13 @@ if [[ "$1" == "major" ]]; then
fi
sleep 2
-rm /tmp/glab.log || true
+rm /tmp/glab.log >/dev/null 2>&1 || true
glab mr create --fill --yes --source-branch ${SOURCEBRANCH} --target-branch ${TARGETBRANCH} --title "$TITLE" > /tmp/glab.log
EC=0
grep "Failed to create merge request." /tmp/glab.log || EC=$?
-if [[ $EC -eq 0 ]]; then glab mr create --recover; fi
+if [[ $EC -eq 0 ]]; then glab mr create --recover > /tmp/glab.log; fi
+EC=0
+grep "Failed to create merge request." /tmp/glab.log || EC=$?
+if [[ $EC -eq 0 ]]; then exit 1; fi
sleep 5
glab mr merge --yes ${SOURCEBRANCH}
--
GitLab