Skip to content

avoid duplicate files in --all-files during conflict #3727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asottile merged 1 commit into from
Jul 21, 2026
+12 −1
Merged

avoid duplicate files in --all-files during conflict #3727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pre_commit/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]:
Expand Down
11 changes: 11 additions & 0 deletions tests/git_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', '.')
Expand Down
Loading