From: Petr Špaček <pspacek@isc.org>
Date: Fri, 31 Jan 2025 13:20:04 +0000 (+0100)
Subject: Fix shell escaping in post-merge before_script
X-Git-Tag: v9.18.34~7^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=37d3ccf19f3c20ec229d1a8e35f46459c02e58f5;p=thirdparty%2Fbind9.git

Fix shell escaping in post-merge before_script

Fixup for commit 60140607740bf8e07c0f223c18798bef36ef439c
"Do not trigger post-merge jobs for cross-project pushes".

Related: isc-projects/bind9!10029
(cherry picked from commit 6276e0b23b678c271de38e92b460b5eba9da0d04)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0dbcd7b42a..d409d8fdf12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1710,7 +1710,7 @@ pairwise:
     # non-fast-forward merges are disabled so we have to have merge commit on top
     - MERGE_REQUEST_ID="$(git log -1 --format='%b' | sed --silent -e "s|^See merge request ${CI_PROJECT_PATH}\!||p")"
     - >
-      : stop if this is not a merge request in the current project's namespace
+      : stop if this is not a merge request in the current project\'s namespace
     - test -n "$MERGE_REQUEST_ID"
     - git clone --depth 1 https://gitlab.isc.org/isc-projects/bind9-qa.git