Update Git to v2.26.0#1642
Merged
derrickstolee merged 3 commits intomicrosoft:masterfrom Mar 24, 2020
Merged
Conversation
7276b80 to
40d70dc
Compare
8a7df17 to
936125e
Compare
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
936125e to
56c838f
Compare
kewillford
approved these changes
Mar 24, 2020
Member
kewillford
left a comment
There was a problem hiding this comment.
Looks good. I don't see the change to "Ignore whitespace lines when checking output." Did we not need that anymore? Remove it from the PR description if that is the case.
Contributor
Author
You're right. That was a Scalar-only change. Thanks! |
Merged
derrickstolee
added a commit
that referenced
this pull request
Apr 15, 2020
Includes the following PRs: * #1642: Update Git to v2.26.0 * #1647: Fix commit-graph expiration * #1652: RepoRegistry: ignore non-existent repos * #1653: Update Git to include v2.26.1 The update to include Git v2.26.0 comes with a new default backend for `git rebase`. By switching from the `apply` backend to the `merge` backend, some rebase situations that would previously fail will now succeed automatically. This comes with a slight performance drawback, but it is the direction that the Git community has decided to go. Please see [the Git documentation](https://git-scm.com/docs/git-rebase#_behavioral_differences) for more details.
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#251 for details.
This required an update to our test infrastructure. The rebase merge backend changed in a way that it would now open an editor during
git rebase --continue, causing a test to wait forvimto close. Set the editor to be a no-op. This also changes the output to include the commit oid, so useGIT_COMMITTER_TIMEto be a constant to keep the commits the same.