Merge pull request #3727 from pre-commit/dedupe

asottile · web-flow · commit 766e550cd31d · 2026-07-21T16:44:34.000-04:00
avoid duplicate files in --all-files during conflict
diff --git a/pre_commit/git.py b/pre_commit/git.py
@@ -152,7 +152,7 @@ def intent_to_add_files() -> list[str]:
 
 
 def get_all_files() -> list[str]:
-    return zsplit(cmd_output('git', 'ls-files', '-z')[1])
+    return zsplit(cmd_output('git', 'ls-files', '-z', '--deduplicate')[1])
 
 
 def get_changed_files(old: str, new: str) -> list[str]:
diff --git a/tests/git_test.py b/tests/git_test.py
@@ -225,6 +225,17 @@ def test_all_files_non_ascii(non_ascii_repo):
     assert ret == ['интервью']
 
 
+def test_all_files_merge_conflict(in_merge_conflict):
+    ret = git.get_all_files()
+    assert sorted(ret) == sorted([
+        '.pre-commit-config.yaml',
+        'bar_only_file',
+        'conflict_file',
+        'foo_only_file',
+        'placeholder',
+    ])
+
+
 def test_staged_files_non_ascii(non_ascii_repo):
     non_ascii_repo.join('интервью').write('hi')
     cmd_output('git', 'add', '.')
