From 11e54df4f3d42df1caee3536e2db2cd05eddb610 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Thu, 16 Jun 2022 09:16:38 +0200
Subject: [PATCH] Forward flag if config import should be skipped
---
bin/merge | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/bin/merge b/bin/merge
index d7d0aee..279558e 100755
--- a/bin/merge
+++ b/bin/merge
@@ -99,7 +99,11 @@ fi
echo "Create merge request ..."
# Create MR
-gitlab 201 POST projects/"$PRJID"/merge_requests --data "source_branch=$SOURCEBRANCH" --data "target_branch=$TARGETBRANCH" --data "title=Merging $SOURCEBRANCH into $TARGETBRANCH"
+TITLE=Merging $SOURCEBRANCH into $TARGETBRANCH
+if [[ "${SKIPCONFIGIMPORT}" == "yes" ]]; then
+ TITLE="${TITLE} [SKIP_CONFIG_IMPORT]"
+fi
+gitlab 201 POST projects/"$PRJID"/merge_requests --data "source_branch=$SOURCEBRANCH" --data "target_branch=$TARGETBRANCH" --data "title=$TITLE"
MRID=$(echo "$result" | jq -r ."iid")
if [[ $(isNumeric "$MRID") -eq 1 ]]; then
echo "Can not create merge request"
--
GitLab