From 424fec462110596c5e49d970c827e3ef8b52db65 Mon Sep 17 00:00:00 2001
From: Andrew Fuller <afuller@tenstorrent.com>
Date: Tue, 5 Nov 2024 00:37:57 +0000
Subject: [PATCH] #0: Permit merges and --fixup

---
 infra/git_hooks/verify_commit_message.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/infra/git_hooks/verify_commit_message.py b/infra/git_hooks/verify_commit_message.py
index 5dfda5c6e14..62d7af27c2f 100644
--- a/infra/git_hooks/verify_commit_message.py
+++ b/infra/git_hooks/verify_commit_message.py
@@ -10,7 +10,8 @@
 """
 FORMAT_MSG = "#<GH ISSUE NUMBER> or MET-<JIRA ISSUE NUMBER>: <non-empty message>"
 VALID_PREFIXES = "|".join(["#", "MET-"])
-MATCHING_REGEX = f"^({VALID_PREFIXES})(\d+\:\ .)"
+STANDARD_PREFIXES = "|".join(["Merge remote-tracking branch ", "fixup! "])
+MATCHING_REGEX = f"^(({VALID_PREFIXES})(\d+\:\ .)|({STANDARD_PREFIXES}))"
 
 
 def print_commit_msg(commit_msg_whole):