git pull with rebase and autostash

[morvael]

Apache NetBeans version

Apache NetBeans 29

What happened

I believe the GIT action/toolbar button "Pull from Upstream" is misleading. It's not using git pull action, but git merge --ff. I configured git globally (and repository specifically) to use rebase & autostash for pull by default and hoped the button will do exactly that. Sadly there's no pull button and no option to configure and change default behavior. I think current button could be renamed to fetch & merge (or just merge) and new button added with specifically the pull action (honoring global/repository default settings).

Language / Project Type / NetBeans Component

Java Maven Project

How to reproduce

Use GIT "Pull from Upstream" toolbar button or relevant menu action. Check output.

Did this work correctly in an earlier version?

No / Don't know

Operating System

Linux Mint MATE 22.3 (kernel 6.17.0-20-generic)

JDK

Temurin-21.0.10+7

Apache NetBeans packaging

Apache NetBeans binary zip

Anything else

No response

Are you willing to submit a pull request?

No

[mbien]

I configured git globally (...) and hoped the button will do exactly that.

this won't pick this setting up since it isn't running git from the environment it runs jgit which is a java implementation of git. Not saying that this couldn't be implemented if someone wanted but the action is likely doing what it should atm.

[morvael]

Looking for a way to implement true pull toolbar button as a plugin (or core NB feature), but the very object oriented model of it all is kind of confusing. First requirement would be to check if jgit supports pull --rebase --autostash at all.

[morvael]

But the main question was why Merge is titled Pull (in the code I can see it's interchangeable). Maybe it was before git added pull. I found that part misleading, correcting it would just probably involve editing some i18n strings.