◐ Shell
clean mode source ↗

deduplicate filenames from `git ls-files` during conflicts by karlhillx · Pull Request #3708 · pre-commit/pre-commit

Skip to content

Navigation Menu

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sign up

Appearance settings

Conversation

@karlhillx

pre-commit run --all-files lists conflicted paths multiple times because git ls-files -z returns one entry per stage for unmerged files. De-duplicated with dict.fromkeys to preserve order. Existing in_merge_conflict fixture covers the test.

Fixes #3706

pre-commit run --all-files lists conflicted paths multiple times
because git ls-files -z returns one entry per stage for unmerged
files. De-duplicated with dict.fromkeys to preserve order.
Existing in_merge_conflict fixture covers the test.

Fixes pre-commit#3706

@asottile

this feels like AI which we don't accept PRs (given the "Fixes" issue was essentially declined) -- plus --deduplicate does this better

2 participants

@karlhillx @asottile