Update Git to include en/sparse-checkout#1661
Closed
derrickstolee wants to merge 3 commits intomicrosoft:masterfrom
Closed
Update Git to include en/sparse-checkout#1661derrickstolee wants to merge 3 commits intomicrosoft:masterfrom
derrickstolee wants to merge 3 commits intomicrosoft:masterfrom
Conversation
f496762 to
e49d5b9
Compare
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
The sparse-checkout feature was updated with a more detailed warning message. This only happens when a formerly-untracked file hits a file on disk that used to be outside the sparse scope. Since our control repo doesn't use sparse-checkout but VFS for Git uses the virtualization hook to feed into the sparse-checkout code, this means we need to relax the conditions on our test. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
e49d5b9 to
bf98b7c
Compare
| } | ||
|
|
||
| [TestCase] | ||
| public void ResetMixedOnlyAddedThenCheckoutWithConflicts() |
There was a problem hiding this comment.
I'm confused. This test case was modified in the second commit to change Validate... to Run..., but then the whole test was deleted in the third commit. Not sure if this was intended or what.
Contributor
Author
There was a problem hiding this comment.
Sorry for the commit confusion. I could not get this test to work the same because of how the (intended?) behavior changed for sparse paths.
Contributor
Author
There was a problem hiding this comment.
While rebasing onto v2.27.0-rc0, I think I found a reason why this test would fail. I'll close this PR and work on the rebased version instead.
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
2 participants
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 microsoft/git#267.