From: Tim Rühsen <tim.ruehsen@gmx.de>
Date: Tue, 9 Apr 2019 10:19:00 +0000 (+0200)
Subject: Pass CI commit check if branches are 'even'
X-Git-Tag: gnutls_3_6_8~55^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=31aac45d3b36c1c8d061bf41b93c51f36a5cb9a9;p=thirdparty%2Fgnutls.git

Pass CI commit check if branches are 'even'

Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
---

diff --git a/devel/check_if_signed b/devel/check_if_signed
index e7e5c504b2..61466a05b3 100755
--- a/devel/check_if_signed
+++ b/devel/check_if_signed
@@ -17,8 +17,11 @@ echo "source=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"
 # create list of commits of the current branch
 commits=$(git rev-list --no-merges $CI_MERGE_REQUEST_TARGET_BRANCH_NAME..)
 if [ -z "$commits" ]; then
-    echo "Couldn't find any commits to check"
-    exit 1
+  # OK if both branches are 'even'
+  git diff --quiet $CI_MERGE_REQUEST_TARGET_BRANCH_NAME.. && exit 0
+
+  echo "Couldn't find any commits to check"
+  exit 1
 fi
 
 # check if author's email matches email in 'Signed-off-by'