diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2012-08-27 00:54:59 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2012-08-27 00:54:59 +0200 |
| commit | 0264c313bae0308dadc4ed1db28f2f979a435451 (patch) | |
| tree | 93a2253423f0aa28c9c3fe5208c0997e6a97ae63 /org.eclipse.jgit | |
| parent | 0e684bb97c458b516263c2dd0b62c857b8ad1f93 (diff) | |
| download | jgit-0264c313bae0308dadc4ed1db28f2f979a435451.tar.gz jgit-0264c313bae0308dadc4ed1db28f2f979a435451.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 ac7430ae2e..6f87349e5b 100644 --- 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( |