ControlGitRepo.cs: switch to 'git branch --set-upstream-to'#408
Merged
jeffhostetler merged 1 commit intomicrosoft:mainfrom Jul 20, 2020
jeffhostetler:fix-branch-set-upstream
Merged
ControlGitRepo.cs: switch to 'git branch --set-upstream-to'#408jeffhostetler merged 1 commit intomicrosoft:mainfrom jeffhostetler:fix-branch-set-upstream
jeffhostetler merged 1 commit intomicrosoft:mainfrom
jeffhostetler:fix-branch-set-upstream
Conversation
Support for 'git branch --set-upstream' was finally dropped in v2.15 and now causes Git to call die(). See 52668846ea2d41ffbd87cda7cb8e492dea9f2c4d. Update our usage in the functional test suite to use the new form: 'git branch --set-upstream-to'. This was causing 70+ Git commands to fail in the functional test suite (from the error alone and an unknown number of tests to fail because the worktree was not updated as expected). Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
derrickstolee
approved these changes
Jul 20, 2020
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
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.
Support for 'git branch --set-upstream' was finally dropped in v2.15 and
now causes Git to call die(). See 52668846ea2d41ffbd87cda7cb8e492dea9f2c4d.
Update our usage in the functional test suite to use the new form:
'git branch --set-upstream-to'.
This was causing 70+ Git commands to fail in the functional test suite
(from the error alone and an unknown number of tests to fail because
the worktree was not updated as expected).
Signed-off-by: Jeff Hostetler jeffhost@microsoft.com