Community
Participate
Working Groups
when doing a RebaseResult r = git.rebase().call() ; if the above rebase is a purely FAST_FORWARD r.getStatus() will not return RebaseResult.Status.STASH_APPLY_CONFLICTS even is there is a conflict I think the reason is, that - in the FAST_FORWARD case, autoStashApply() is called directly in RebaseCommand.call(line 295) and the boolean result, that indicates if there was a conflict applying the autostash is disregarded, whilest - in the "normal" case the RebaseCommand::finishRebase is beeing called, where the result of the autoStashApply() is taken into account, resulting in the expected STASH_APPLY_CONFLICTS state
https://git.eclipse.org/r/c/jgit/jgit/+/204913