summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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'