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 = "# or MET-: " 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):