ci: Recognise any commit starting with ‘Merge’ as a merge commit, which

is ignored by commitlint.
This commit is contained in:
Stephen Morgan 2021-09-27 23:22:00 +10:00 committed by Simon Michael
parent 4c0b9bfa24
commit e53e95540e

View File

@ -55,7 +55,7 @@ function checkmsg()
# Is this some boring commit, eg a hard-to avoid github merge commit ?
# Ignore those.
if echo "$SUMMARY" | grep -qE '^Merge \w{40} into \w{40}'
if echo "$SUMMARY" | grep -qE '^Merge'
then
# shellcheck disable=SC2059
printf "$FMT" "$HASH" "$SUMMARY" "[ignored]"