Browse Source

t3404: cleanup double empty lines between tests

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 9 years ago committed by Junio C Hamano
parent
commit
8172c421d2
  1. 6
      t/t3404-rebase-interactive.sh

6
t/t3404-rebase-interactive.sh

@ -771,7 +771,6 @@ test_expect_success 'rebase-i history with funny messages' ' @@ -771,7 +771,6 @@ test_expect_success 'rebase-i history with funny messages' '
test_cmp expect actual
'


test_expect_success 'prepare for rebase -i --exec' '
git checkout master &&
git checkout -b execute &&
@ -780,7 +779,6 @@ test_expect_success 'prepare for rebase -i --exec' ' @@ -780,7 +779,6 @@ test_expect_success 'prepare for rebase -i --exec' '
test_commit three_exec main.txt three_exec
'


test_expect_success 'running "git rebase -i --exec git show HEAD"' '
set_fake_editor &&
git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
@ -793,7 +791,6 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' ' @@ -793,7 +791,6 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' '
test_cmp expected actual
'


test_expect_success 'running "git rebase --exec git show HEAD -i"' '
git reset --hard execute &&
set_fake_editor &&
@ -807,7 +804,6 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' ' @@ -807,7 +804,6 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' '
test_cmp expected actual
'


test_expect_success 'running "git rebase -ix git show HEAD"' '
git reset --hard execute &&
set_fake_editor &&
@ -835,7 +831,6 @@ test_expect_success 'rebase -ix with several <CMD>' ' @@ -835,7 +831,6 @@ test_expect_success 'rebase -ix with several <CMD>' '
test_cmp expected actual
'


test_expect_success 'rebase -ix with several instances of --exec' '
git reset --hard execute &&
set_fake_editor &&
@ -850,7 +845,6 @@ test_expect_success 'rebase -ix with several instances of --exec' ' @@ -850,7 +845,6 @@ test_expect_success 'rebase -ix with several instances of --exec' '
test_cmp expected actual
'


test_expect_success 'rebase -ix with --autosquash' '
git reset --hard execute &&
git checkout -b autosquash &&

Loading…
Cancel
Save