Set updated_skipworktree on restore --staged#794
Closed
tyrielv wants to merge 2 commits intomicrosoft:vfs-2.50.1from
Closed
Set updated_skipworktree on restore --staged#794tyrielv wants to merge 2 commits intomicrosoft:vfs-2.50.1from
tyrielv wants to merge 2 commits intomicrosoft:vfs-2.50.1from
Conversation
Author
|
Moving back to draft. This fixes the "disappearing" files from git status, but there's still a difference between git-with-VFS and regular git when running regular git unstages the added files too, so |
tyrielv
force-pushed
the
vfs-aware-restore
branch
from
3bd326c to
8e1957d
Compare
tyrielv
force-pushed
the
vfs-aware-restore
branch
from
8e1957d to
e83dd5e
Compare
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.
This is a fix for microsoft/VFSForGit#1855
When
git restore --stagedis run in certain situations, such as aftergit cherry-pick -norgit reset --soft, git may change the SKIP_WORKTREE bits for some entries from TRUE to FALSE.index->updated_skipworktreeneeds to be set in this scenario so that when VFSForGit is notified about the index update it can invalidate its cache.