pre-commit
diff --git a/‎pre_commit/git.py
Copy file name to clipboardExpand all lines: pre_commit/git.py
+1-1Lines changed: 1 addition & 1 deletion b/‎pre_commit/git.py
Copy file name to clipboardExpand all lines: pre_commit/git.py
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/git_test.py
Copy file name to clipboardExpand all lines: tests/git_test.py
+9Lines changed: 9 additions & 0 deletions b/‎tests/git_test.py
Copy file name to clipboardExpand all lines: tests/git_test.py
+9Lines changed: 9 additions & 0 deletions
@@ -126,7 +126,7 @@ def get_conflicted_files() -> set[str]:
     merge_diff_filenames = zsplit(
         cmd_output(
             'git', 'diff', '--name-only', '--no-ext-diff', '-z',
-            '-m', tree_hash, 'HEAD', 'MERGE_HEAD',
+            '-m', tree_hash, 'HEAD', 'MERGE_HEAD', '--',
         )[1],
     )
     return set(merge_conflict_filenames) | set(merge_diff_filenames)
 
@@ -141,6 +141,15 @@ def test_get_conflicted_files_unstaged_files(in_merge_conflict):
     assert ret == {'conflict_file'}
 
 
+def test_get_conflicted_files_with_file_named_head(in_merge_conflict):
+    resolve_conflict()
+    open('HEAD', 'w').close()
+    cmd_output('git', 'add', 'HEAD')
+
+    ret = set(git.get_conflicted_files())
+    assert ret == {'conflict_file', 'HEAD'}
+
+
 MERGE_MSG = b"Merge branch 'foo' into bar\n\nConflicts:\n\tconflict_file\n"
 OTHER_MERGE_MSG = MERGE_MSG + b'\tother_conflict_file\n'