From 3db6e05e52b24e16fbe93376d3fd8935e5f4fc9b Mon Sep 17 00:00:00 2001
From: Stefan Lay <stefan.lay@sap.com>
Date: Wed, 15 Jan 2014 13:23:49 +0100
Subject: Fix fast forward rebase with rebase.autostash=true

The folder .git/rebase-merge was not removed in this case. The
repository was then still in rebase state, but neither abort nor
continue worked.

Bug: 425742
Change-Id: I43cea6c9e5f3cef9d6b15643722fddecb40632d9
---
 org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'org.eclipse.jgit/src')

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 ac6f5487a1..e930c535e6 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
@@ -281,6 +281,9 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
 					return RebaseResult.INTERACTIVE_PREPARED_RESULT;
 				if (res != null) {
 					autoStashApply();
+					if (rebaseState.getDir().exists())
+						FileUtils.delete(rebaseState.getDir(),
+								FileUtils.RECURSIVE);
 					return res;
 				}
 			}
-- 
cgit v1.2.3