From: Petr Špaček <pspacek@isc.org>
Date: Thu, 25 Sep 2025 10:22:41 +0000 (+0200)
Subject: Do not fail post-merge jobs after force-push
X-Git-Tag: v9.21.15~42^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbaf4fe6cd234da949c83894c197ceca92ac541b;p=thirdparty%2Fbind9.git

Do not fail post-merge jobs after force-push

Rebase happens in -sub branches regularly so these failures would
produce log noice.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41cd632a1ba..c6143f4f4cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2057,7 +2057,7 @@ pairwise:
     - >
       echo "previous branch tip: $CI_COMMIT_BEFORE_SHA"
     - set +o pipefail; git log --format='%H' | grep --silent "$CI_COMMIT_BEFORE_SHA" && PREVIOUS_TIP_REACHABLE=1
-    - test "$PREVIOUS_TIP_REACHABLE" != "1" && echo "force-push detected, stop" && exit 1
+    - test "$PREVIOUS_TIP_REACHABLE" != "1" && echo "force-push detected, stop" && exit 0
     # 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")"
     - >