fix: crash on ambiguous ref 'HEAD'

tusharsadhwani · tusharsadhwani · commit d51bdbfd2b80 · 2025-03-13T17:29:20.000+05:30
diff --git a/pre_commit/git.py b/pre_commit/git.py
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ def get_conflicted_files() -> set[str]:`
`126`	`126`	`merge_diff_filenames = zsplit(`
`127`	`127`	`cmd_output(`
`128`	`128`	`'git', 'diff', '--name-only', '--no-ext-diff', '-z',`
`129`		`- '-m', tree_hash, 'HEAD', 'MERGE_HEAD',`
	`129`	`+ '-m', tree_hash, 'HEAD', 'MERGE_HEAD', '--',`
`130`	`130`	`)[1],`
`131`	`131`	`)`
`132`	`132`	`return set(merge_conflict_filenames) \| set(merge_diff_filenames)`