deduplicate filenames from `git ls-files` during conflicts by karlhillx · Pull Request #3708 · pre-commit/pre-commit
-
-
Notifications
You must be signed in to change notification settings - Fork 980
Conversation
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
this feels like AI which we don't accept PRs (given the "Fixes" issue was essentially declined) -- plus --deduplicate does this better
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters