Revert "Show a rebase result dialog if cherry-picking fails."

This reverts commit 677e4b02ed6964a153fb380888019a1996fe562b.

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

1 files changed, 1 insertions, 14 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CherryPickOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CherryPickOperation.java
index 1fe17b63ee..aa5d363f62 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CherryPickOperation.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CherryPickOperation.java
@@ -32,7 +32,6 @@ import org.eclipse.egit.core.internal.util.ProjectUtil;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.RebaseCommand;
 import org.eclipse.jgit.api.RebaseCommand.InteractiveHandler;
-import org.eclipse.jgit.api.RebaseResult;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.errors.IllegalTodoFileModification;
 import org.eclipse.jgit.lib.Constants;
@@ -51,8 +50,6 @@ public class CherryPickOperation implements IEGitOperation {
 
 	private List<RevCommit> commits;
 
-	private RebaseResult result;
-
 	/**
 	 * Create cherry pick operation
 	 *
@@ -109,8 +106,7 @@ public class CherryPickOperation implements IEGitOperation {
 					ObjectId headCommitId = repo.resolve(Constants.HEAD);
 					RevCommit headCommit = new RevWalk(repo)
 							.parseCommit(headCommitId);
-					result = git.rebase()
-							.setUpstream(headCommit.getParent(0))
+					git.rebase().setUpstream(headCommit.getParent(0))
 							.runInteractively(handler)
 							.setOperation(RebaseCommand.Operation.BEGIN).call();
 				} catch (GitAPIException e) {
@@ -136,13 +132,4 @@ public class CherryPickOperation implements IEGitOperation {
 	public ISchedulingRule getSchedulingRule() {
 		return RuleUtil.getRule(repo);
 	}
-
-	/**
-	 * Returns the result of the rebase operation.
-	 *
-	 * @return the rebase result
-	 */
-	public RebaseResult getResult() {
-		return result;
-	}
 }