summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 18:36:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-06 18:36:06 (GMT)
commit075652953772dbabd01d471a4c73200b0ab5d8a6 (patch)
treedaaeee8c03641b1892f403c25781afa4cc4e51d3
parente7cc0ede1837b6f679e245e29ae3687fc5e6c20d (diff)
parentbd46cfae8224ec2240e58302e8ddd16b701cbe6a (diff)
downloadgit-075652953772dbabd01d471a4c73200b0ab5d8a6.zip
git-075652953772dbabd01d471a4c73200b0ab5d8a6.tar.gz
git-075652953772dbabd01d471a4c73200b0ab5d8a6.tar.bz2
Merge branch 'mt/rebase-i-keep-empty-test'
* mt/rebase-i-keep-empty-test: rebase --keep-empty -i: add test
-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 c0023a5..8197ed2 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 &&
(