Enable rebase to continue for all rebase stages

EGit should be able to continue a rebase started by C Git.

Change-Id: I63058026295fec34157b5687ae87ae9cb0c27c86
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
index ac7430ae2e87952a2650f1a49ef1db7bc09bfe1d..6f87349e5b88cbd13b734159ae8696b61299fa7c 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
@@ -723,6 +723,9 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
                        // these operations are only possible while in a rebasing state
                        switch (repo.getRepositoryState()) {
                        case REBASING_INTERACTIVE:
+                       case REBASING:
+                       case REBASING_REBASING:
+                       case REBASING_MERGE:
                                break;
                        default:
                                throw new WrongRepositoryStateException(MessageFormat.format(