undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4104: drop hand-rolled error reporting

Browse Source 
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>
This commit is contained in:
Jeff King 2015-03-20 06:13:36 -04:00 committed by Junio C Hamano
parent 635ce72fae
commit 8bafd20fd9
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t4104-apply-boundary.sh
View File

@ -95,10 +95,7 @@ do
test_expect_success "apply $kind-patch $with context" ' test_expect_success "apply $kind-patch $with context" '
cat original >victim && cat original >victim &&
git update-index victim && git update-index victim &&
git apply --index '"$u$kind-patch.$with"' || { git apply --index '"$u$kind-patch.$with"' &&
cat '"$kind-patch.$with"'
(exit 1)
} &&
test_cmp '"$kind"'-expect victim test_cmp '"$kind"'-expect victim
' '
done done
@ -113,10 +110,7 @@ do
test_expect_success "apply non-git $kind-patch without context" ' test_expect_success "apply non-git $kind-patch without context" '
cat original >victim && cat original >victim &&
git update-index victim && git update-index victim &&
git apply --unidiff-zero --index '"$kind-ng.without"' || { git apply --unidiff-zero --index '"$kind-ng.without"' &&
cat '"$kind-ng.without"'
(exit 1)
} &&
test_cmp '"$kind"'-expect victim test_cmp '"$kind"'-expect victim
' '
done done