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>
Jeff King committed
Mar 20, 2015 at 06:13 UTC
8bafd20fd97f5101d1c2c8a332864a2cbc97ce0b
1 file changed
+2
-8
t/t4104-apply-boundary.sh
+2
-8
@@ -95,10 +95,7 @@ do
95
test_expect_success "apply $kind-patch $with context" '
96
cat original >victim &&
97
git update-index victim &&
98
- git apply --index '"$u$kind-patch.$with"' || {
99
- cat '"$kind-patch.$with"'
100
- (exit 1)
101
- } &&
98
+ git apply --index '"$u$kind-patch.$with"' &&
99
test_cmp '"$kind"'-expect victim
100
'
101
done
@@ -113,10 +110,7 @@ do
110
test_expect_success "apply non-git $kind-patch without context" '
111
cat original >victim &&
112
git update-index victim &&
116
- git apply --unidiff-zero --index '"$kind-ng.without"' || {
117
- cat '"$kind-ng.without"'
118
- (exit 1)
119
- } &&
113
+ git apply --unidiff-zero --index '"$kind-ng.without"' &&
114
test_cmp '"$kind"'-expect victim
115
'
116
done