[PATCH 07/10] t3404 (rebase -i): unroll test_commit loops
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Oct 31, 2010, 07:38 UTC
- Message-ID
- <20101031073825.GH11483@burratino>
- In-Reply-To
- <20101031072640.GA11483@burratino>
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> --- 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 c0e69f6..b372314 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
-- 1.7.2.3.557.gab647.dirty