Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try resolve git branches beginning with '@' before replacing with symbolic full path #66097

Merged

Conversation

@rcbevans
Copy link
Contributor

commented Jan 6, 2019

Try naiive rev-parse for branches beginning with @ to see if they resolve, before replacing with symbolic full name version.

This PR is to resolve #65438. Commit 2c0167e introduced a change where the git repository getBranch function would eagerly check for branches beginning with '@' and replace the branch name with the resolved symbolic full name, which breaks the later branch diffing logic, causing such branches to appear as having no upstream branch, and so the git statusbar would show the publish button, even though the upstream may already exist.

This PR allows the code to try and resolve the branch name as-is initially, and if this fails, and the branch begins with an '@', it then replaces the branch name with the symbolic full name and proceeds. This should fix the regression, making sure legitimate '@' branches work as expected, but maintaining the fix which the commit was presumably adding.

I don't know what exactly the '@ name syntax' referred to in the commit message is, and so I have no way of testing, but I have verified that my change addresses the reported issue of branches beginning with '@' not working.

Try naiive rev-parse for branches beginning with @ to see if they res…
…olve, before replacing with symbolic full name version.

@joaomoreno joaomoreno added this to the Backlog milestone Jan 7, 2019

@joaomoreno joaomoreno added the git label Jan 7, 2019

@joaomoreno

This comment has been minimized.

Copy link
Member

commented Aug 7, 2019

I don't know what exactly the '@ name syntax' referred to in the commit message is, and so I have no way of testing, but I have verified that my change addresses the reported issue of branches beginning with '@' not working.

Yeah I don't remember either... too bad I didn't leave enough comments in there or in the commit. I like this approach, thanks! 🍻

@joaomoreno joaomoreno merged commit 0e59bcb into microsoft:master Aug 7, 2019

@joaomoreno joaomoreno modified the milestones: Backlog, August 2019 Aug 7, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.