Question

When I create a new branch from a remote branch using EGit I get the wrong remote tracking set up:

I create the local branch feature1 from the remote branch refs/heads/master and immediately push to upstream. The followign remote tracking gets configured in my .git/config file:

[branch "feature1"]
    remote = origin
    merge = refs/heads/master

So, pull and push in that branch will pull and pull from/to the remote master branch. I would expect the following tracking configuration instead:

[branch "feature1"]
    remote = origin
    merge = refs/heads/feature1

I know I can fix it even from EGit, but I’m worried about other developers in my team not realizing this and pushing uncompleted features to the master branch.

Am I doing something wrong?

Answer 1

Maybe you should advise developers to create feature-branches not from the remote-tracking branch (e.g. origin/master), but from the local one (master). This way, EGit will not set up any remote tracking by default.

If you then decide to publish the branch for the first time, it should be possible to set up the remote tracking (the equivalent of git push –set-upstream) after bug 378960 is implemented.