-
Notifications
You must be signed in to change notification settings - Fork 451
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update Git to include en/sparse-checkout #1661
Update Git to include en/sparse-checkout #1661
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
@@ -78,19 +78,6 @@ public void ResetMixedThenCheckoutWithConflicts() | |||
this.FilesShouldMatchCheckoutOfTargetBranch(); | |||
} | |||
|
|||
[TestCase] | |||
public void ResetMixedOnlyAddedThenCheckoutWithConflicts() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
See microsoft/git#267.