Repository navigation
fix(pick): add --deduplicate to git ls-files - #2593
Closed
not-my-profile wants to merge 1 commit into
Closed
not-my-profile wants to merge 1 commit into
not-my-profile wants to merge 1 commit into
Conversation
`git ls-files --cached` can output the same path multiple times when it has multiple index entries during an unresolved merge conflict.
not-my-profile
force-pushed
the
fix-pick-git
branch
from
November 7, 2026 07:26
a7fd801 to
317b1a4
Compare
echasnovski
added a commit
that referenced
this pull request
Nov 7, 2026
Details: - If there are merge conflicts, their files are present multiple times in the output of `git ls-files` without `--deduplicate` flag. Related to #2593
Member
|
Thanks for the PR! Indeed, I could reproduce. The solution required changes that are comparable with the whole PR diff, so I did it myself (with you credited as co-author). Should now be fixed on the latest In the future, please create an issue first (as described in the 'CONTRIBUTING.md'). This would have reduced the time to figure out the exact steps to reproduce the issue. |
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
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.
git ls-files --cachedcan output the same path multiple times when it has multilpe index entries during an unresolved merge conflict.