diff --git a/.gitlab-ci/check-commit-log.sh b/.gitlab-ci/check-commit-log.sh index 83118ad67..c7ca1b106 100755 --- a/.gitlab-ci/check-commit-log.sh +++ b/.gitlab-ci/check-commit-log.sh @@ -16,10 +16,10 @@ if [ -z "$commits" ]; then exit 1 fi -function commit_message_has_url() { +function commit_message_has_mr_url() { commit=$1 commit_message=$(git show -s --format='format:%b' $commit) - echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(-/\)\?\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)" + echo "$commit_message" | grep -qe "^$CI_MERGE_REQUEST_PROJECT_URL\/\(-\/\)\?merge_requests\/$CI_MERGE_REQUEST_IID$" return $? } @@ -54,8 +54,8 @@ RET=0 for commit in $commits; do commit_short=$(echo $commit | cut -c -8) - if ! commit_message_has_url $commit; then - echo "Commit $commit_short needs a merge request or issue URL" + if commit_message_has_mr_url $commit; then + echo "Commit $commit_short must not contain a link to its own merge request" exit 1 fi