diff options
| author | Jeff King <peff@peff.net> | 2015-03-20 06:13:36 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 11:35:57 -0700 |
| commit | 8bafd20fd97f5101d1c2c8a332864a2cbc97ce0b (patch) | |
| tree | 3b4d710e4f45654cba6855aed9210082c8b23ee9 | |
| parent | 635ce72fae23a7d94625325fb02b5ff4416f3596 (diff) | |
| download | git-8bafd20fd97f5101d1c2c8a332864a2cbc97ce0b.tar.gz | |
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>
| -rwxr-xr-x | t/t4104-apply-boundary.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh index 497afdc6b4..32e3b0ee0b 100755 --- 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 |