diff options
| author | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-04-09 19:04:06 +0000 |
|---|---|---|
| committer | Tim Rühsen <tim.ruehsen@gmx.de> | 2019-04-09 19:04:06 +0000 |
| commit | af7c8bf1690e2a66f25ec22cf989f254530e4d0c (patch) | |
| tree | b935300601acbcc5929ed9eb6fc09140fd3af029 | |
| parent | e360b641eedddd2dea389d9fd860a86ff21297a1 (diff) | |
| parent | 31aac45d3b36c1c8d061bf41b93c51f36a5cb9a9 (diff) | |
| download | gnutls-af7c8bf1690e2a66f25ec22cf989f254530e4d0c.tar.gz | |
Merge branch 'tmp-check-even' into 'master'
Pass CI commit check if branches are 'even'
See merge request gnutls/gnutls!975
| -rwxr-xr-x | devel/check_if_signed | 7 |
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' |