|
|
@@ -1641,6 +1641,19 @@ public class RebaseCommandTest extends RepositoryTestCase { |
|
|
|
assertEquals("2222222", steps.get(1).getCommit().name()); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
|
public void testRebaseShouldBeAbleToHandleLinesWithoutCommitMessageInRebaseTodoFile() |
|
|
|
throws IOException { |
|
|
|
String todo = "pick 1111111 \n" + "pick 2222222 Commit 2\n" |
|
|
|
+ "# Comment line at end\n"; |
|
|
|
write(getTodoFile(), todo); |
|
|
|
|
|
|
|
List<RebaseTodoLine> steps = db.readRebaseTodo(GIT_REBASE_TODO, false); |
|
|
|
assertEquals(2, steps.size()); |
|
|
|
assertEquals("1111111", steps.get(0).getCommit().name()); |
|
|
|
assertEquals("2222222", steps.get(1).getCommit().name()); |
|
|
|
} |
|
|
|
|
|
|
|
@Test |
|
|
|
public void testRebaseShouldNotFailIfUserAddCommentLinesInPrepareSteps() |
|
|
|
throws Exception { |