diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-31 02:38:25 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-09 15:01:18 -0800 |
| commit | 391a825f5bd534063ac0dec42aa0159b67764ede (patch) | |
| tree | 31d6e4f62e231cec1cc8f38391b670ad539394e2 /t/t3404-rebase-interactive.sh | |
| parent | 0155a64e88ad65408f9ca6d988156aec0898863d (diff) | |
| download | git-391a825f5bd534063ac0dec42aa0159b67764ede.tar.gz | |
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>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c0e69f61b3..b372314a10 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -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 |