Eclipse Community Forums: EGit / JGit » Behavior changed when pushing a new branch?

Help

Home

Home » Eclipse Projects » EGit / JGit » Behavior changed when pushing a new branch?

Show: Today's Messages :: Show Polls :: Message Navigator

Behavior changed when pushing a new branch? [message #1856059]

Thu, 17 November 2022 17:31

Lorenzo Bettini

Messages: 1812
Registered: July 2009
Location: Firenze, Italy

Senior Member

Hi

I'm pretty sure that a few versions ago (maybe two Eclipse distributions ago?) when I created a new local branch and I pushed that to the remote, Egit would push it to a new remote branch with the same name of the newly created branch.

This does not happen anymore. This way, it happens quite often that I create a new branch locally and when I push it I push it to the remote master.

How could I restore the old behavior?

thanks in advance

HOME: http://www.lorenzobettini.it
TDD Book: https://leanpub.com/tdd-buildautomation-ci
Xtext Book: https://www.packtpub.com/application-development/implementing-domain-specific-languages-xtext-and-xtend-second-edition

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856060 is a reply to message #1856059]

Thu, 17 November 2022 18:57

David M. Karr

Messages: 802
Registered: July 2009

Senior Member

I think you'll need to detail exactly what you're doing. I create local branches quite often, and they map to the remote with a branch of the same name.

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856064 is a reply to message #1856060]

Fri, 18 November 2022 07:58

Lorenzo Bettini

Messages: 1812
Registered: July 2009
Location: Firenze, Italy

Senior Member

David, I'm not doing anything special. Let's say I'm on the master branch, from Eclipse I create a new branch, say "experiments", and switch to that branch. I create a commit on "experiments" and then I push: it pushes "experiments" to "master", instead of pushing on a new remote branch "experiments". This has been happening since a few versions ago. I should have reported earlier but I forgot I'm afraid. Before, it used to push to a new remote branch "experiments"

Maybe I should somehow update my git configuration? But I haven't changed anything in that respect, and it happens with all my Git repositories.

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856267 is a reply to message #1856064]

Wed, 30 November 2022 09:24

Thomas Wolf

Messages: 576
Registered: August 2016

Senior Member

There have been changes in the push implementation in EGit, yes. But they should not have changed that, I think.

How exactly do you create the branch, and how exactly do you push? Which menu command or button do you use? How does the branch configuration in .git/config for that new branch look, and how does the remote config look?

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856275 is a reply to message #1856267]

Wed, 30 November 2022 16:14

Lorenzo Bettini

Messages: 1812
Registered: July 2009
Location: Firenze, Italy

Senior Member

Let's say I'm on the master branch. From the "History" view I right-click and select "Create Branch..." (I also select to checkout the new branch). If I then push the branch, e.g., with "Push Head..." from the "Staging" view or from the "Git Repositories" view ("Push <name of the branch>...") the dialog, by default, proposes to push to the "master" branch.

The config looks like that

[branch "<name of new branch>"]
	remote = origin
	merge = refs/heads/<name of new branch>
	rebase = false

So there's no push configuration

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856306 is a reply to message #1856275]

Thu, 01 December 2022 21:25

Thomas Wolf

Messages: 576
Registered: August 2016

Senior Member

I cannot reproduce this. Could you show the remote config for origin, please? (The [remote "origin"] section in .git/config.)

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856307 is a reply to message #1856306]

Thu, 01 December 2022 21:45

Lorenzo Bettini

Messages: 1812
Registered: July 2009
Location: Firenze, Italy

Senior Member

Here's an example (but I experience the same in all my cloned repos)

[remote "origin"]
	url = git@github.com:eclipse-emf-parsley/emf-parsley.git
	fetch = +refs/heads/*:refs/remotes/origin/*

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856327 is a reply to message #1856307]

Sat, 03 December 2022 12:24

Thomas Wolf

Messages: 576
Registered: August 2016

Senior Member

No idea. I don't see anything in the code that would cause this, and I cannot reproduce this. This would need debugging with your exact setup to figure out what's going on. (I tried with the "Push Branch 'xxx'... dialog. That would be org.eclipse.egit.internal.ui.push.PushBranchPage.)

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856328 is a reply to message #1856327]

Sat, 03 December 2022 12:31

Lorenzo Bettini

Messages: 1812
Registered: July 2009
Location: Firenze, Italy

Senior Member

What could be special in my setup? This happens with all my repositories.. what's the exact git config in your case?
Could it be due to the fact I clone my repos from the command line?
Should I have specific push configuration?

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856341 is a reply to message #1856328]

Mon, 05 December 2022 07:07

Thomas Wolf

Messages: 576
Registered: August 2016

Senior Member

Lorenzo Bettini wrote on Sat, 03 December 2022 12:31

What could be special in my setup?

I don't know. Which is why I wrote this would need debugging.
Quote:

This happens with all my repositories.. what's the exact git config in your case?

Same as yours, nothing special.
Quote:

Could it be due to the fact I clone my repos from the command line?

Maybe. I doubt it, but I don't know.
Quote:

Should I have specific push configuration?

No. What you've shown looks perfectly normal and should work. (And does work for me.)

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856645 is a reply to message #1856341]

Tue, 20 December 2022 17:40

Lorenzo Bettini

Messages: 1812
Registered: July 2009
Location: Firenze, Italy

Senior Member

I'll try to summarize the steps that reproduce my problem. (I get the same problem both on Linux, macOS and Windows):

Downloaded the Eclipse distribution for Java developers

- on a brand new workspace I "Import from Git",
- I clone this repository https://github.com/LorenzoBettini/maven-bank-example selecting only "master"
- imported from the cloned repo the single project
- from the git history I right-click on the "master" branch and create a new branch "example" (leaving all the defaults)

Screenshot:
https://ibb.co/nbkJnKw

- on the "Git Repositories" view I right click and select "Push Branch 'example'"

Screenshot:
https://ibb.co/zXf6R6y

- and it proposes to push to "master" INSTEAD OF "example"

Screenshot:
https://ibb.co/mcycWC4

- having a look at the configuration in the Git preferences the "example" branch is set to merge with "master"

Screenshot:
https://ibb.co/xhsf20F

This drives me mad... what am I doing wrong?

[Updated on: Tue, 20 December 2022 17:41]

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856674 is a reply to message #1856645]

Thu, 22 December 2022 07:01

Thomas Wolf

Messages: 576
Registered: August 2016

Senior Member

Uncheck "Configure upstream branch for push and pull".

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856677 is a reply to message #1856674]

Thu, 22 December 2022 08:37

Lorenzo Bettini

Messages: 1812
Registered: July 2009
Location: Firenze, Italy

Senior Member

Thanks!
I was about to answer myself because I had found out that myself.
Maybe I'm picky, but that shows that the default behavior HAS changed...

Report message to a moderator

Re: Behavior changed when pushing a new branch? [message #1856691 is a reply to message #1856677]

Thu, 22 December 2022 22:51

Thomas Wolf

Messages: 576
Registered: August 2016

Senior Member

At least neither the behavior of that checkbox nor the "Push branch 'xxx'" behavior seems to have changed. I just discovered that I still had an age-old Eclipse with an age-old EGit around, and surprisingly it even still started: I see the exact same behavior in EGit 4.10 as in EGit 6.2 or EGit nightly. I also see no recent code changes in that dialog or in the component for that checkbox. ("Recent" meaning within the past three years).

If there is a change, I must have a blind spot.

Report message to a moderator

Previous Topic:	Discussion on default values of "Configure upstream for push and pull"
Next Topic:	Exit from Eclipse Git

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Mon May 06 08:26:10 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter