]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7aa1b85) | patch
Rebase Interoperability second part: fix "pop steps" 85/1985/1
authorMathias Kinzler <mathias.kinzler@sap.com>
Wed, 1 Dec 2010 14:10:13 +0000 (15:10 +0100)
committerMathias Kinzler <mathias.kinzler@sap.com>
Wed, 1 Dec 2010 14:10:13 +0000 (15:10 +0100)
commit59e62ba7e10188c6170bd97ffbd9c8768d9745ea
treed422855d75599ed6fe146f0c93949dd8c16928bdtree | snapshot
parent7aa1b85821e007c0243772273960069497284290commit | diff
Rebase Interoperability second part: fix "pop steps"

If the CLI stops a rebase upon conflict, the current
step is already popped from the git-rebase-todo and appended to the
"done" file. The current implementation wrongly pops the step only
after successful cherry-pick.

Change-Id: I8640dda0cbb2a5271ecf75fcbad69410122eeab6
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
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