Update Git to include en/sparse-checkout #374
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
derrickstolee
force-pushed
the
sparse-checkout-status-fix
branch
2 times, most recently
from
1d8fd59
to
64d54b4
Compare
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
If we don't run the control repo with a sparse-checkout, then our error messages will deviate from those in our Scalar repo. It's time to make these tests cover the sparse mode in each case, since that's a Git feature, not a Scalar feature. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
force-pushed
the
sparse-checkout-status-fix
branch
2 times, most recently
from
4021c91
to
2e84934
Compare
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
force-pushed
the
sparse-checkout-status-fix
branch
from
2e84934
to
356dbf5
Compare
|
/azp run microsoft.scalar |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Scalar/CommandLine/CloneVerb.cs
Outdated
| @@ -333,7 +333,7 @@ private Result GitClone() | |||
| git.SetInLocalConfig($"core.sparseCheckoutCone", "true"); | |||
|
|
|||
| this.fileSystem.CreateDirectory(Path.Combine(this.enlistment.DotGitRoot, "info")); | |||
| this.fileSystem.WriteAllText(Path.Combine(this.enlistment.DotGitRoot, "info", "sparse-checkout"), "/*\n!/*/*"); | |||
| this.fileSystem.WriteAllText(Path.Combine(this.enlistment.DotGitRoot, "info", "sparse-checkout"), "/*\n!/*/"); | |||
There was a problem hiding this comment.
do we want a trailing \n here ??
There was a problem hiding this comment.
I just ran a local test clone and the file is created without the final NL.
There was a problem hiding this comment.
Sorry that my commits aren't great here. The final commit uses git sparse-checkout init --cone directly, which skirts this issue. Thanks for your attention to detail!
jeffhostetler
approved these changes
May 15, 2020
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.
Also fixes a bug when running
scalar clonefollowed bygit sparse-checkout disable.See microsoft/git#267.