checkout: ignore skip-worktree when virtual #658
Merged
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
As documented in microsoft/VFSForGit#1812, attempting to restore a file fails when using either of these commands in a VFS for Git repo: git restore --source=<commit> <path> git checkout <commit> -- <path> To discover the issue, I debugged such a call and found that since opt->ignore_skipworktree is not set, that the restore will not update the index when the file is not hydrated. I verified that this works as expected, including that the file on-disk is projecting the new index version. Signed-off-by: Derrick Stolee <stolee@gmail.com>
jeffhostetler
approved these changes
Jun 19, 2024
This was referenced Jul 12, 2024
dscho
added a commit
that referenced
this pull request
Jul 12, 2024
…store` (#674) This reverts #658 and essentially reopens microsoft/VFSForGit#1812. Resolves #673. The issue is that by overriding the `ignore_skip_wortree` value (normally set by `--ignore-skip-worktree`) we then force Git to hydrate the entire working directory in a `git restore .`. This leads to some interesting trade-offs: 1. Users on v2.45.2.vfs.0.2 (where `git restore .` overhydrates), they can use `git reset --hard` as a better representation of this behavior. 2. Users on any Git version can use `git restore --ignore-skip-worktree -- <pathspec>` when using a smaller-scale pathspec that corresponds to files they care about and probably have hydrated. I will include these workarounds in the VFS for Git issue. To get to a real solution here, we would somehow need to turn the `ignore_skip_worktree` bit into two bits: a. A bit to say "update index entries that have `SKIP_WORKTREE` set". b. A bit to say "update the working directory even if `SKIP_WORKTREE` is set". And perhaps this "working directory" version is what was intended when adding the `--ignore-skip-worktree` option, but it's more involved and has upstream implications to make changes here.
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.
As documented in microsoft/VFSForGit#1812, attempting to restore a file fails when using either of these commands in a VFS for Git repo:
To discover the issue, I debugged such a call and found that since
opt->ignore_skipworktreeis not set, that the restore will not update the index when the file is not hydrated.I verified that this works as expected, including that the file on-disk is projecting the new index version.