From 17c4ad4ba7e5262bac336c1c45ad9badefebca47 Mon Sep 17 00:00:00 2001
From: Anthony Bilinski <me@abilinski.com>
Date: Wed, 16 Feb 2022 08:10:48 -0800
Subject: [PATCH] chore(CI): Revert 40989e54d88fab705c0afb131b9e5826744ee621

Workaround was only due to a travis limitation that's no longer present on GH actions.
---
 verify-commit-messages.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/verify-commit-messages.sh b/verify-commit-messages.sh
index 755802e6f..ad3122219 100755
--- a/verify-commit-messages.sh
+++ b/verify-commit-messages.sh
@@ -36,10 +36,11 @@ ARG="$1"
 echo "" # ← formatting
 
 grep_for_invalid() {
-    # 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})$'
+    # 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}$'
 }
 
 # Conform, /OR ELSE/.