Git: Checkout to a tracked local branch instead when trying to checkout to a remote branch#61149
Merged
joaomoreno merged 8 commits intomicrosoft:masterfrom May 27, 2019
Merged
Conversation
laphets
changed the title
laphets
changed the title
laphets
changed the title
laphets
changed the title
WenInCode
reviewed
Oct 18, 2018
Update extensions/git/src/api/git.d.ts Fix another typo Fix some typo
laphets
force-pushed
the
fix-branch-checkout
branch
from
852c8be to
d24031b
Compare
Contributor
Author
|
@joaomoreno Could you help me check this, thx.. |
|
@joaomoreno this is vital |
Member
|
Thanks! 🎆 |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
Fix #60904
Description
Problem raised when trying to checkout a remote branch, while there existing a local branch having the same name.
Solution
Basically, we can check whether the remote branch name matches with any local branch. However, I think it's confusing sometimes when the local branch is tracking to an upstream branch with another name. Therefore, I think it's better to judge by the tracking ship instead of simply branch name.
By using
we can get all the tracking relations from local branch to the upstream branch, just as what is shown in the capture below.
Therefore, I add a
GetTrackingmethod inextensions/git/src/git.tsto parse for the tracking relationship and return. And when a user is trying, for instance, checkout toorigin/master, vscode will find the tracking relation frommastertoorigin/master, and checkout tomasterinstead.