summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2018-07-01 20:23:50 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-03 12:38:05 -0700
commite7eb15faca767cd00acf722ce0382538b7add29a (patch)
treee68b64d61b46392b0fb3435f4161d953e45f5cf3
parentt6036: fix broken "merge fails but has appropriate contents" tests (diff)
downloadtgif-e7eb15faca767cd00acf722ce0382538b7add29a.tar.xz
t7201: drop pointless "exit 0" at end of subshell
This test employs a for-loop inside a subshell and correctly aborts the loop and fails the test overall (via "exit 1") if any iteration of the for-loop fails. Otherwise, it exits the subshell with an explicit but entirely unnecessary "exit 0", presumably to indicate that all iterations of the loop succeeded. The &&-chain is broken between the for-loop and the "exit 0". Rather than fixing the &&-chain, just drop the pointless "exit 0". Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t7201-co.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index ab9da61da3..8d8a63a24b 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -673,7 +673,6 @@ test_expect_success 'custom merge driver with checkout -m' '
do
grep $t arm || exit 1
done
- exit 0
) &&
mv arm expect &&