From c031463f7ae2bdf161bd083dca04a97eed746d81 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Wed, 28 Jun 2023 13:21:54 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#57 Allow the merge script to exit
gracefully if no changes are available
---
bin/merge | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/bin/merge b/bin/merge
index beac949..186a3dc 100755
--- a/bin/merge
+++ b/bin/merge
@@ -29,10 +29,13 @@ fi
git fetch
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
+glab mr create --fill --yes --source-branch ${SOURCEBRANCH} --target-branch ${TARGETBRANCH} --title "$TITLE" > /tmp/glab.log 2>&1
+EC=0
+grep "could not find any commits" /tmp/glab.log || EC=$?
+if [[ $EC -eq 0 ]]; then echo "No changes available."; exit 0; fi
EC=0
grep "Failed to create merge request." /tmp/glab.log || EC=$?
-if [[ $EC -eq 0 ]]; then glab mr create --recover > /tmp/glab.log; fi
+if [[ $EC -eq 0 ]]; then glab mr create --recover > /tmp/glab.log 2>&1; fi
EC=0
grep "Failed to create merge request." /tmp/glab.log || EC=$?
if [[ $EC -eq 0 ]]; then exit 1; fi
--
GitLab