Skip to content

fix(pick): add --deduplicate to git ls-files - #2593

Closed
not-my-profile wants to merge 1 commit into
nvim-mini:mainfrom
not-my-profile:fix-pick-git
Closed

not-my-profile wants to merge 1 commit into
nvim-mini:mainfrom
not-my-profile:fix-pick-git

Conversation

@not-my-profile

Copy link
Copy Markdown
Contributor

git ls-files --cached can output the same path multiple times when it has multilpe index entries during an unresolved merge conflict.

`git ls-files --cached` can output the same path multiple times
when it has multiple index entries during an unresolved merge conflict.
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
@echasnovski

Copy link
Copy Markdown
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 main.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants