reset: fix mixed reset when using virtual filesystem (again) #651
Conversation
This file contains 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
This should fix git#490, at least in the case that I've been able to verify. The issue is that reset was setting the skip-worktree bit more frequently than it should have. The previous fix in git#494 was focused on the case where a file is added or removed across the diff. However, when the file exists on both sides but still needs to be staged in a mixed reset then we should avoid the skip-worktree bit. Signed-off-by: Derrick Stolee <[email protected]>
|
I wanted to validate this change with the VFS for Git functional tests, but I'm not able to run the installer generation build. |
|
Thanks for taking a look at this, @derrickstolee! Based on your understanding of the issue, do you know how I can work around it in the meantime? I can't figure out locally what causes some files to work and some to not. I frequently unstage my changes to more easily iterate on them (editing the diff view directly in VSCode), and this bug prevents doing so with confidence. |
dscho
approved these changes
Jun 3, 2024
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.
This should fix #646, at least in the case that I've been able to verify.
The issue is that reset was setting the skip-worktree bit more frequently than it should have. The previous fix in #494 was focused on the case where a file is added or removed across the diff. However, when the file exists on both sides but still needs to be staged in a mixed reset then we should avoid the skip-worktree bit.
This fork contains changes specific to monorepo scenarios. If you are an
external contributor, then please detail your reason for submitting to
this fork: