t4104: drop hand-rolled error reporting

This use of "||" fools --chain-lint into thinking the
&&-chain is broken (and indeed, it is somewhat broken; a
failure of update-index in these tests would show the patch
file, even if we never got to the part of the test where we
fed the patch to git-apply).

The extra blocks were there to include more debugging
output, but it hardly seems worth it; the user should know
which command failed (because git-apply will produce error
messages) and can look in the trash directory themselves.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index 497afdc6b4903dab3e60cef056ca1cd1b389ced4..32e3b0ee0b9d00516602934353d92da35e8b19f1 100755 (executable)
--- a/t/t4104-apply-boundary.sh
+++ b/t/t4104-apply-boundary.sh
@@ -95,10 +95,7 @@ do
                test_expect_success "apply $kind-patch $with context" '
                        cat original >victim &&
                        git update-index victim &&
-                       git apply --index '"$u$kind-patch.$with"' || {
-                               cat '"$kind-patch.$with"'
-                               (exit 1)
-                       } &&
+                       git apply --index '"$u$kind-patch.$with"' &&
                        test_cmp '"$kind"'-expect victim
                '
        done
@@ -113,10 +110,7 @@ do
        test_expect_success "apply non-git $kind-patch without context" '
                cat original >victim &&
                git update-index victim &&
-               git apply --unidiff-zero --index '"$kind-ng.without"' || {
-                       cat '"$kind-ng.without"'
-                       (exit 1)
-               } &&
+               git apply --unidiff-zero --index '"$kind-ng.without"' &&
                test_cmp '"$kind"'-expect victim
        '
 done