Skip to content

Commit

Permalink
t3404 (rebase -i): unroll test_commit loops
Browse files Browse the repository at this point in the history
Allow test_commit failures in loop iterations before the last one to
cause the test assertion to fail.

More importantly, avoiding these loops makes the test a little
simpler to read and decreases the vertical screen footprint of
the setup test assertion by one line.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Nov 9, 2010
1 parent 0155a64 commit 391a825
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions t/t3404-rebase-interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,20 +48,19 @@ test_expect_success 'setup' '
git checkout -b branch2 F &&
test_commit I file6 &&
git checkout -b conflict-branch A &&
for n in one two three four
do
test_commit $n conflict
done &&
test_commit one conflict &&
test_commit two conflict &&
test_commit three conflict &&
test_commit four conflict &&
git checkout -b no-conflict-branch A &&
for n in J K L M
do
test_commit $n file$n
done &&
test_commit J fileJ &&
test_commit K fileK &&
test_commit L fileL &&
test_commit M fileM &&
git checkout -b no-ff-branch A &&
for n in N O P
do
test_commit $n file$n
done
test_commit N fileN &&
test_commit O fileO &&
test_commit P fileP
'

# "exec" commands are ran with the user shell by default, but this may
Expand Down

0 comments on commit 391a825

Please sign in to comment.