diff options
| author | Stefan Lay <stefan.lay@sap.com> | 2014-01-15 13:23:49 +0100 |
|---|---|---|
| committer | Stefan Lay <stefan.lay@sap.com> | 2014-01-15 13:23:49 +0100 |
| commit | 3db6e05e52b24e16fbe93376d3fd8935e5f4fc9b (patch) | |
| tree | 4a9f8e99245580948d62be7077f389156809e671 /org.eclipse.jgit | |
| parent | 50a830f7d477e7e04eaf95f5e8af88fc308bcecd (diff) | |
| download | jgit-3db6e05e52b24e16fbe93376d3fd8935e5f4fc9b.tar.gz jgit-3db6e05e52b24e16fbe93376d3fd8935e5f4fc9b.zip | |
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
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 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; } } |