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

Set the upstream remote branch when pushing #7866

Merged
merged 1 commit into from
May 26, 2020

Conversation

westbury
Copy link
Contributor

What it does

fixes #7596

The issue reported against Gitpod has also been reported against Mbed Studio.

This is a very simple fix that always ensures the remote branch is set when pushing. If the user pushes to a different remote then the remote branch will be switched to that remote.

This was a problem with the Git Theia extension only. The vs-code Git builtin asks the user to confirm that the branch should be published.

How to test

Create a new branch and push. Then try pulling from that branch. Check other workflows to ensure that we are not interfering with existing workflows by always setting the remote tracking branch.

Review checklist

Reminder for reviewers

Signed-off-by: Nigel Westbury <nigelipse@miegel.org>
@westbury westbury added the git issues related to git label May 22, 2020
Copy link
Contributor

@svenefftinge svenefftinge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, I always use 'publish changes' in the status bar for that reason.

@akosyakov akosyakov merged commit ca6b505 into eclipse-theia:master May 26, 2020
@westbury westbury deleted the set-upstream branch September 7, 2020 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
git issues related to git
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git Push creates an upstream branch but does not link it to local
3 participants