Skip to content

Commit bd46cfa

Browse files
mstsirkingitster
authored andcommitted
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 <[email protected]> Acked-by: Neil Horman <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7bbc4e8 commit bd46cfa

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

t/t3404-rebase-interactive.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ test_expect_success 'setup' '
6767
SHELL=
6868
export SHELL
6969

70+
test_expect_success 'rebase --keep-empty' '
71+
git checkout -b emptybranch master &&
72+
git commit --allow-empty -m "empty" &&
73+
git rebase --keep-empty -i HEAD~2 &&
74+
git log --oneline >actual &&
75+
test_line_count = 6 actual
76+
'
77+
7078
test_expect_success 'rebase -i with the exec command' '
7179
git checkout master &&
7280
(

0 commit comments

Comments
 (0)