[pull] master from microsoft:master - #152
Merged
Merged
Conversation
In a GVFS enlistment, a hydrated placeholder is on disk but is not in ModifiedPaths, so it still has skip-worktree. A mixed reset does not update the working tree. If git leaves skip-worktree set on a hydrated placeholder whose index entry the reset changes, reset and status do not report the file as modified. The git side of this behavior requires microsoft/git v2.55.0.vfs.0.3 or later. Add two tests: - CorruptionReproTests.ReproResetMixedSkipWorktree is a black-box test. It runs the command sequence that exposed the problem (blame, then reset HEAD~1) and compares the results with the control repo. - ResetMixedTests.ResetMixedClearsSkipWorktreeOnHydratedPlaceholder is a white-box test. It asserts each precondition before the reset: the index entry changes, the file is hydrated, the file is not in ModifiedPaths, and skip-worktree is set. After the reset, it asserts that skip-worktree is cleared and that GVFS adds the file to ModifiedPaths. Also document on GitHelpers.ValidateGitCommand that it compares status output after each command other than status. Assisted-by: Claude Opus 4.6 Signed-off-by: Tyrie Vella <tyrielv@gmail.com>
…ktree Add functional test for reset --mixed skip-worktree bug (depends on microsoft/git#935)
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )