From 40989e54d88fab705c0afb131b9e5826744ee621 Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Mon, 13 Apr 2020 00:51:48 -0700 Subject: [PATCH] chore(ci): don't use git --no-merges for git commit message checking When doing a short clone, like travis does, git can't tell if the oldest commit is a merge of not. Just allow either commit message format for all commits, and rely on reviewers and common sense to not name normal commits "Merge.*" Fix #6051 --- verify-commit-messages.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/verify-commit-messages.sh b/verify-commit-messages.sh index ad3122219..755802e6f 100755 --- a/verify-commit-messages.sh +++ b/verify-commit-messages.sh @@ -36,11 +36,10 @@ ARG="$1" echo "" # ← formatting grep_for_invalid() { - # differentiate what is allowed for commit messages and merge messages - git log --no-merges --format=format:'%s' "$ARG" \ - | grep -v -E '^(feat|fix|docs|style|refactor|perf|revert|test|chore)(\(.{,12}\))?:.{1,68}$' \ - || git log --merges --format=format:'%s' "$ARG" \ - | grep -v -E '^Merge .{1,70}$' + # we can't rely on differentiating merge and normal commits since short clones that travis does may not be able + # to tell if the oldest commit is a merge commit or not + git log --format=format:'%s' "$ARG" \ + | grep -v -E '^((feat|fix|docs|style|refactor|perf|revert|test|chore)(\(.{,12}\))?:.{1,68})|(Merge .{1,70})$' } # Conform, /OR ELSE/.