t3404 (rebase -i): unroll test_commit loops
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>
Jonathan Nieder committed
Oct 31, 2010 at 02:38 UTC
391a825f5bd534063ac0dec42aa0159b67764ede
1 file changed
+11
-12
t/t3404-rebase-interactive.sh
+11
-12
@@ -48,20 +48,19 @@ test_expect_success 'setup' '
48
git checkout -b branch2 F &&
49
test_commit I file6 &&
50
git checkout -b conflict-branch A &&
51
- for n in one two three four
52
- do
53
- test_commit $n conflict
54
- done &&
51
+ test_commit one conflict &&
52
+ test_commit two conflict &&
53
+ test_commit three conflict &&
54
+ test_commit four conflict &&
55
git checkout -b no-conflict-branch A &&
56
- for n in J K L M
57
- do
58
- test_commit $n file$n
59
- done &&
56
+ test_commit J fileJ &&
57
+ test_commit K fileK &&
58
+ test_commit L fileL &&
59
+ test_commit M fileM &&
60
git checkout -b no-ff-branch A &&
61
- for n in N O P
62
- do
63
- test_commit $n file$n
64
- done
61
+ test_commit N fileN &&
62
+ test_commit O fileO &&
63
+ test_commit P fileP
64
'
65
66
# "exec" commands are ran with the user shell by default, but this may