Merge branch 'mt/rebase-i-keep-empty-test'

* mt/rebase-i-keep-empty-test: rebase --keep-empty -i: add test
11 years ago · 0756529537
1 changed files with 8 additions and 0 deletions
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@ -67,6 +67,14 @@ test_expect_success 'setup' '
				@@ -67,6 +67,14 @@ test_expect_success 'setup' '
 SHELL=
 export SHELL

+test_expect_success 'rebase --keep-empty' '
+	git checkout -b emptybranch master &&
+	git commit --allow-empty -m "empty" &&
+	git rebase --keep-empty -i HEAD~2 &&
+	git log --oneline >actual &&
+	test_line_count = 6 actual
+'
+
 test_expect_success 'rebase -i with the exec command' '
 	git checkout master &&
 	(