1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

chore(travis): make commit message verification script ignore merges

Provided that merge commit message uses same format as `merge-pr.sh`
script.
This commit is contained in:
Zetok Zalbavar 2016-04-14 22:08:56 +01:00
parent abcfbe9f92
commit 5b7002a846
No known key found for this signature in database
GPG Key ID: C953D3880212068A

View File

@ -31,7 +31,7 @@ echo "" # ← formatting
# Conform, /OR ELSE/. # Conform, /OR ELSE/.
if git log --format=format:'%s' "$ARG" | \ if git log --format=format:'%s' "$ARG" | \
grep -v -E '^(feat|fix|docs|style|refactor|perf|revert|test|chore)(\(.+\))?:.{1,68}$' grep -v -E '^((feat|fix|docs|style|refactor|perf|revert|test|chore)(\(.+\))?:.{1,68})|(Merge pull request #[[:digit:]]{4,10})$'
then then
echo "" echo ""
echo "Above ↑ commits don't conform to commit message format:" echo "Above ↑ commits don't conform to commit message format:"