#0: Permit merges and --fixup (#14698)

tenstorrent · Nov 5, 2024 · 3861156 · 3861156
1 parent 819b8d3
commit 3861156
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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):