summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rühsen <tim.ruehsen@gmx.de>2019-04-09 12:19:00 +0200
committerTim Rühsen <tim.ruehsen@gmx.de>2019-04-09 12:19:19 +0200
commit31aac45d3b36c1c8d061bf41b93c51f36a5cb9a9 (patch)
treeb424d8cf44983e9daaa6abeb65e422fac5432467
parentf8b3be9b1296a4ece07a91ff65500d5f8ec16109 (diff)
downloadgnutls-tmp-check-even.tar.gz
Pass CI commit check if branches are 'even'tmp-check-even
Signed-off-by: Tim Rühsen <tim.ruehsen@gmx.de>
-rwxr-xr-xdevel/check_if_signed7
1 files changed, 5 insertions, 2 deletions
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'