undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase --keep-empty -i: add test

Browse Source 
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>
This commit is contained in:
Michael S. Tsirkin 2014-05-18 23:28:39 +03:00 committed by Junio C Hamano
parent 7bbc4e8fdb
commit bd46cfae82
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t3404-rebase-interactive.sh
View File

@ -67,6 +67,14 @@ test_expect_success 'setup' '
SHELL= SHELL=
export 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' ' test_expect_success 'rebase -i with the exec command' '
git checkout master && git checkout master &&
( (