chore(format): case-insensitive merge commit check

compilerla · Oct 21, 2024 · 7278451 · 7278451
1 parent ea49565
commit 7278451
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conventional_pre_commit/format.py b/conventional_pre_commit/format.py
@@ -74,7 +74,7 @@ def is_merge(self, commit_msg: str = ""):
         See the documentation, please https://git-scm.com/docs/git-merge.
         """
         commit_msg = self.clean(commit_msg)
-        return commit_msg.startswith("Merge branch ")
+        return commit_msg.lower().startswith("merge branch ")
 
 
 class ConventionalCommit(Commit):

diff --git a/tests/test_format.py b/tests/test_format.py
@@ -396,7 +396,7 @@ def test_has_autosquash_prefix(commit, input, expected_result):
     "input,expected_result",
     [
         ("Merge branch '2.x.x' into '1.x.x'", True),
-        ("Merge branch 'dev' into 'main'", True),
+        ("merge branch 'dev' into 'main'", True),
         ("nope not a merge commit", False),
         ("type: subject", False),
     ],