From: Michael S. Tsirkin <mst@redhat.com>
Date: Sun, 18 May 2014 20:28:39 +0000 (+0300)
Subject: rebase --keep-empty -i: add test
X-Git-Tag: v2.1.0-rc0~153^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bd46cfae8224ec2240e58302e8ddd16b701cbe6a?hp=--cc

rebase --keep-empty -i: add test

There's some special code in rebase -i to deal
with --keep-empty.
Add test for this combination.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

bd46cfae8224ec2240e58302e8ddd16b701cbe6a
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 50e22b1cad..9848524aee 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -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 &&
 	(