Ability to prepopulate merge vs rebase choice based on project policy preference

[srikanth-sankaran]

I work on Eclipse/JDT - the project policies are to opt for Rebase when pulling (Right click on repo, choose Pull ...) or when I create a branch and configure upstream for push/pull.

Most of the time when working with egit, these dialogs come pre-populated with Merge. Given how divergent the course of action these choices implement, I am paranoid about the wrong default choice being picked up.

This issue is to request a way to configure and control the pre-poplulation choice of Rebase v Merge.

(If there is already a way to do that, apologies for the noise - I did ask around among more expert users and didn't find a way)

[iloveeclipse]

@NikunjChavda19 : your problem is completely unrelated to this ticket. Please create dedicated issue!

[NikunjChavda19]

@iloveeclipse : I have already created one.

Please refer this : https://github.com/eclipse-egit/egit/issues/1#issue-1969923700

[iloveeclipse]

@iloveeclipse : I have already created one.

Fine, so please avoid hijacking other tickets.

[NikunjChavda19]

@iloveeclipse Oh ! Can you please let me know the dedicated platform to report the issue ?

[iloveeclipse]

Can you please let me know the dedicated platform to report the issue ?

You have already reported one: https://github.com/eclipse-egit/egit/issues/1

[srikanth-sankaran]

@NikunjChavda19 - If your issue doesn't get picked up for work in "reasonable time" and it is impacting your work/productivity, you may want to ask in the project mailing lists for help. (See https://projects.eclipse.org/projects/technology.egit/contact). I don't have visibility into the project's plans, priorities and resource constraint etc.

[NikunjChavda19]

@srikanth-sankaran : Thank you for the guidance 👍

[Bananeweizen]

That's possible since many years: https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchautoSetupRebase (with always). egit will respect that setting. In fact, I have all my company Oomph profiles with that (and some other) config values so everyone gets it without even knowing. Might be good to add it to JDTs Oomph setup too.

[iloveeclipse]

Thanks, that works!

TL;DR

branch.autoSetupRebase=always entry should be added to the git repository properties dialog, the end result will look like:

[iloveeclipse]

@merks : for those who use Oomph (I'm thinking on Platform setups), could we automatically change git settings after clone to have rebase preselected?

[merks]

Could you please open an issue and in that issue paste the full config file text of a properly configured repository so that I can be sure I've created the correct structure. Probably we'd want to do this for all the SDK setup clones, so it doesn't matter in which repo you create the issue...

[iloveeclipse]

@merks : https://github.com/eclipse-jdt/eclipse.jdt/issues/79

[srikanth-sankaran]

Thanks, that works!

TL;DR

branch.autoSetupRebase=always entry should be added to the git repository properties dialog

FYI, This works for the git branch, git switch or git checkout operations wrapped up by the egit UI. However, if right click on a repo and choose Pull ... I still see merge as the prepopulated choice.

[tomaswolf]

Also set pull.rebase = true.

[merks]

@tomaswolf

The existing property looks like this in the setup:

So this new one should be like the selected above?

[tomaswolf]

What's that image? An Oomph setup? I don't know how it should look.

If the git config is already set via the Oomph setup, then it's fine. But then I don't understand why srikanth still had the merge option pre-selected.

[merks]

Yes, I don't understand either what the purpose of this other option is. I can set it like above and then it looks like this in the clone:

But what does that do?

When Oomph clones the branch it always sets it to rebase by default, as you can see above. So a Pull... does this

Before I add the other option, I'd like to understand what it does.

[Bananeweizen]

I'm not sure if the "rebase.pull" option needs to be set globally. The behavior is as follows, AFAIK:

• Due to autosetuprebase, every newly created branch will be set up with the rebase=true setting in the git config, therefore all menus and dialogs related to that branch will show the rebase strategy.
• The "Pull..." dialog will take the information stored with the branch to prepopulate the strategy combobox. If there are branches in the local repository that were created before applying the autosetuprebase setting, they don't have individual "branch = true" settings in the git config. When selecting such a branch in the "Pull... dialog", the repository default for rebase/merge will be taken, if it exists. If a repository default doesn't exist, then simply the last used value from the dialog seems to be taken as default.
• The pull.rebase=true suggestion of Tomas adds a repository default, thereby eliminating the case where the dialog uses "whatever was used last time" for branches without an own config.

Does that roughly fit, @tomaswolf or did I miss some aspect? I would think that a freshly created Oomph setup would not need the rebase.pull option, because there are no branches without specific setting, right?

@merks You can experiment on your own by simply deleting all lines belonging to a branch configuration, but not the section of the branch. So for the first branch in this screenshot the dialog will always be rebase, for the second one it will be either repository default or last used: