deduplicate filenames from git ls-files during conflicts#3708
Open
karlhillx wants to merge 3 commits into
Open
deduplicate filenames from git ls-files during conflicts#3708karlhillx wants to merge 3 commits into
git ls-files during conflicts#3708karlhillx wants to merge 3 commits into
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 pre-commit#3706
for more information, see https://pre-commit.ci
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
pre-commit run --all-files lists conflicted paths multiple times because
git ls-files -zreturns one entry per stage for unmerged files. De-duplicated withdict.fromkeysto preserve order. Existingin_merge_conflictfixture covers the test.Fixes #3706