[I] [Bug]: Pull fails with a NullPointerException on a branch without a matching branch on origin (hop)

["Adalennis (via GitHub)" <gi...@apache.org>]

Adalennis opened a new issue, #8934:
URL: https://github.com/apache/hop/issues/8934

   ### Apache Hop version?
   
   2.20.0-SNAPSHOT
   
   ### Java version?
   
   Java 21
   
   ### Operating system
   
   macOS
   
   ### What happened?
   
   Pull... on a local branch that does not exist on origin under the same name fails with an internal error instead of a clear message. Nothing is changed, but the user gets no hint of the cause:
   
       Error merging branch 'origin/test-pull-local' with strategy 'org.eclipse.jgit.merge.StrategyRecursive@6608c8d5'
       Caused by: NullPointerException: Cannot invoke "org.eclipse.jgit.lib.AnyObjectId.getName()" because "aCommit" is null
           at org.apache.hop.git.model.UIGit.pull(UIGit.java:777)
   
   Git itself answers "fatal: No remote for the current branch." for the same branch.
   
   A branch tracking an upstream with a different name (e.g. `my-feature` tracking `origin/feature-123`) cannot be pulled from Hop Gui at all, although `git pull` works.
   
   Steps: `git switch -c test-pull-local`, then status bar branch menu > Pull... in Hop Gui.
   
   ### Issue Priority
   
   Priority: 3
   
   ### Issue Component
   
   Component: Hop Gui


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@hop.apache.org.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org