microsoft / scalar

Scalar: A set of tools and extensions for Git to allow very large monorepos to run on Git without a virtualization layer
MIT License
1.39k stars 63 forks source link

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

Closed jeffhostetler closed 4 years ago

jeffhostetler commented 4 years ago

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