Skip to content

deduplicate filenames from git ls-files during conflicts #3708

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

Open
karlhillx wants to merge 3 commits into
base: main
Choose a base branch
from
+10 −1
Open

deduplicate filenames from git ls-files during conflicts #3708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58667cc
deduplicate filenames from git ls-files during conflicts
karlhillx Jun 13, 2026
8e612fd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 13, 2026
80aa14e
test: assert dedup property instead of exact file list
karlhillx Jun 13, 2026
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
3 changes: 2 additions & 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,8 @@ def intent_to_add_files() -> list[str]:


def get_all_files() -> list[str]:
return zsplit(cmd_output('git', 'ls-files', '-z')[1])
# git ls-files lists unmerged paths once per stage -- deduplicate (#3706)
return list(dict.fromkeys(zsplit(cmd_output('git', 'ls-files', '-z')[1])))


def get_changed_files(old: str, new: str) -> list[str]:
Expand Down
8 changes: 8 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,14 @@ def test_all_files_non_ascii(non_ascii_repo):
assert ret == ['интервью']


def test_all_files_deduplicates_in_merge_conflict(in_merge_conflict):
# git ls-files lists each unmerged path once per stage; #3706
ret = git.get_all_files()
# The fixture contains multiple tracked files; the bug is duplication
assert ret.count('conflict_file') == 1
assert len(ret) == len(set(ret))


def test_staged_files_non_ascii(non_ascii_repo):
non_ascii_repo.join('интервью').write('hi')
cmd_output('git', 'add', '.')
Expand Down
Loading