Update Git to v2.28.0 #400
Merged
Conversation
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
a6c401e to
044b9ab
Compare
6e8195f to
27f07ba
Compare
3c14c90 to
2aa290b
Compare
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
In Git 2.28.0, the code around extensions changed to not allow the extensions at all if the repository format version was not increased. Since the sparse-checkout builtin uses worktree config, we need to increase this setting. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
2aa290b to
29bef1f
Compare
Some subclasses of GitRepoTests override CreateEnlistment so they can do extra steps after the base class creates the repo. However, those steps happen between the base CreateEnlistment() and the rest of the TestSetup code. This started failing with the v2.28.0 upgrade because 'git status' started reporting new info about sparse-checkouts. Move the sparse-checkout setup code into CreateEnlistment() to stop failures. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
29bef1f to
8dfab60
Compare
jeffhostetler
approved these changes
Jul 28, 2020
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#283.
The new logic around
core.repositoryFormatVersionandextensions.*config options causes problems in Scalar due to our use of sparse-checkout. This is resolved by some upstream fixes and some more careful config here.