chore(format): case-insensitive merge commit check

thekaveman · thekaveman · commit a918407c8320 · 2024-11-25T17:13:25.000Z
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),
     ],

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@ def test_has_autosquash_prefix(commit, input, expected_result):`
`396`	`396`	`"input,expected_result",`
`397`	`397`	`[`
`398`	`398`	`("Merge branch '2.x.x' into '1.x.x'", True),`
`399`		`- ("Merge branch 'dev' into 'main'", True),`
	`399`	`+ ("merge branch 'dev' into 'main'", True),`
`400`	`400`	`("nope not a merge commit", False),`
`401`	`401`	`("type: subject", False),`
`402`	`402`	`],`