summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Michael S. Tsirkin <mst@redhat.com>2014-05-18 23:28:39 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-05-19 13:44:00 -0700
commitbd46cfae8224ec2240e58302e8ddd16b701cbe6a (patch)
tree12d034481289def5567533bce25e4d264b437851
parentGit 1.8.5.5 (diff)
downloadtgif-bd46cfae8224ec2240e58302e8ddd16b701cbe6a.tar.xz
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>
-rwxr-xr-xt/t3404-rebase-interactive.sh8
1 files changed, 8 insertions, 0 deletions
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 &&
(