]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 50a830f) | patch
Fix fast forward rebase with rebase.autostash=true 49/20649/1
authorStefan Lay <stefan.lay@sap.com>
Wed, 15 Jan 2014 12:23:49 +0000 (13:23 +0100)
committerStefan Lay <stefan.lay@sap.com>
Wed, 15 Jan 2014 12:23:49 +0000 (13:23 +0100)
commit3db6e05e52b24e16fbe93376d3fd8935e5f4fc9b
tree4a9f8e99245580948d62be7077f389156809e671tree | snapshot
parent50a830f7d477e7e04eaf95f5e8af88fc308bcecdcommit | diff
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.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit