diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2021-12-09 00:11:15 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-12-13 10:29:48 -0800 |
| commit | 0c51d6b4aec9f1959d148960cb55155b676cec78 (patch) | |
| tree | 3b7e70327191ff2a03ec8aacb7f951fb72cb978c /t/t7600-merge.sh | |
| parent | t5000-t5999: detect and signal failure within loop (diff) | |
| download | tgif-0c51d6b4aec9f1959d148960cb55155b676cec78.tar.xz | |
t6000-t9999: detect and signal failure within loop
Failures within `for` and `while` loops can go unnoticed if not detected
and signaled manually since the loop itself does not abort when a
contained command fails, nor will a failure necessarily be detected when
the loop finishes since the loop returns the exit code of the last
command it ran on the final iteration, which may not be the command
which failed. Therefore, detect and signal failures manually within
loops using the idiom `|| return 1` (or `|| exit 1` within subshells).
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index c773e30b3f..f0f6fda150 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -967,7 +967,7 @@ test_expect_success 'set up mod-256 conflict scenario' ' # 256 near-identical stanzas... for i in $(test_seq 1 256); do for j in 1 2 3 4 5; do - echo $i-$j + echo $i-$j || return 1 done done >file && git add file && |