Adalennis opened a new issue, #8937:
URL: https://github.com/apache/hop/issues/8937
### Apache Hop version?
SNAPSHOT-20261009
### Java version?
Java 21
### Operating system
macOS
### What happened?
Git perspective: right-click a tag > "Merge '<tag>' into '<branch>'", when
the merge has conflicts.
- Lightweight tag: an "Error" dialog first shows "Cannot invoke
"org.eclipse.jgit.lib.Ref.getName()" because the return value of
"org.eclipse.jgit.lib.Repository.findRef(String)" is null". After OK the merge
continues correctly (conflict message, .ours/.theirs files).
- Annotated tag: the same dialog, then a ClassCastException and no conflict
message. The repository is left in the middle of the merge (MERGE_HEAD,
conflicting file), with a .ours copy and no .theirs copy, and the user is not
told:
HopException: Error merging branch 'test-tag-annotated' with strategy
'org.eclipse.jgit.merge.StrategyRecursive@6608c8d5'
Caused by: java.lang.ClassCastException: class
org.eclipse.jgit.revwalk.RevTag cannot be cast to class
org.eclipse.jgit.revwalk.RevCommit
at org.apache.hop.git.model.UIGit.resolve(UIGit.java:1796)
at org.apache.hop.git.model.UIGit.open(UIGit.java:1124)
at org.apache.hop.git.model.UIGit.checkout(UIGit.java:1630)
at org.apache.hop.git.model.UIGit.mergeBranch(UIGit.java:1500)
Steps: two branches changing the same line of a file, an annotated tag on
one (`git tag -a`), merge that tag into the other from the Git perspective.
### 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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
