diff options
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
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()); |