Skip to content

ControlGitRepo.cs: switch to 'git branch --set-upstream-to'#408

Merged
jeffhostetler merged 1 commit intomicrosoft:mainfrom
jeffhostetler:fix-branch-set-upstream
Jul 20, 2020
Merged

ControlGitRepo.cs: switch to 'git branch --set-upstream-to'#408
jeffhostetler merged 1 commit intomicrosoft:mainfrom
jeffhostetler:fix-branch-set-upstream

Conversation

@jeffhostetler
Copy link
Contributor

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

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>
@jeffhostetler jeffhostetler merged commit 36f3d7d into microsoft:main Jul 20, 2020
@jeffhostetler jeffhostetler deleted the fix-branch-set-upstream branch July 20, 2020 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants