Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 352884

Summary: rebase continue operation doesn't work properly
Product: [Technology] JGit Reporter: Piotr Janik <janikpiotrek>
Component: JGitAssignee: Project Inbox <jgit.core-inbox>
Status: NEW --- QA Contact:
Severity: normal    
Priority: P3 CC: Szymon.Brandys
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: All   
Whiteboard:

Description Piotr Janik CLA 2011-07-22 11:34:54 EDT
I'm implementing the rebase operation in Orion and I've noticed strange behaviour of rebase continue operation: Comment 8, Bug 351429.
I cannot reproduce this bug myself. However, "Orion part" seems to work properly. 
Strange fact is that after resolving conflicts, RebaseCommand.call() returns status: FAST_FORWARD, and later Repository.getRepositoryState() returns: REBASING_INTERACTIVE. It seems to me like a bug in JGit. As Szymon reports, console version git rebase --continue works properly after resolving conflicts.