From 59e62ba7e10188c6170bd97ffbd9c8768d9745ea Mon Sep 17 00:00:00 2001 From: Mathias Kinzler Date: Wed, 1 Dec 2010 15:10:13 +0100 Subject: 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 --- org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'org.eclipse.jgit.test') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java index d1d3480b23..bddb9ed6e9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java @@ -327,7 +327,7 @@ public class RebaseCommandTest extends RepositoryTestCase { assertTrue(new File(db.getDirectory(), "rebase-merge").exists()); // the first one should be included, so we should have left two picks in // the file - assertEquals(2, countPicks()); + assertEquals(1, countPicks()); // rebase should not succeed in this state try { @@ -416,7 +416,7 @@ public class RebaseCommandTest extends RepositoryTestCase { assertTrue(new File(db.getDirectory(), "rebase-merge").exists()); // the first one should be included, so we should have left two picks in // the file - assertEquals(1, countPicks()); + assertEquals(0, countPicks()); assertFalse(file2.exists()); assertFalse(file3.exists()); -- cgit v1.2.3