Browse Source

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>
stable-2.1
Robin Rosenberg 12 years ago committed by Matthias Sohn
parent
commit
0264c313ba
  1. 3
      org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java

3
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(

Loading…
Cancel
Save