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

* mt/rebase-i-keep-empty-test:
  rebase --keep-empty -i: add test
This commit is contained in:
Junio C Hamano 2014-06-06 11:36:06 -07:00
commit 0756529537

View file

@ -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 &&
(