From 5ca812a19c97a2cbfe797748bc9bf6ebde9e0f64 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 20 Mar 2015 06:07:52 -0400 Subject: [PATCH] t: assume test_cmp produces verbose output Some tests call test_cmp, and if it fails show the actual output generated. This is mostly pointless, as test_cmp will already show a diff between the expected and actual output. It also fools --chain-lint by putting an "||" in the middle of the chain, so we'd rather not use this construct. Note that these cases actually show a pre-processed version of the data, rather than exactly what test_cmp would show. However, test_cmp's output is generally good for pointing the user in the right direction, and they can then dig in the trash directory themselves if they want to see more details. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t6012-rev-list-simplify.sh | 10 ++-------- t/t6111-rev-list-treesame.sh | 5 +---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh index fde5e712eb..b89cd6b07a 100755 --- a/t/t6012-rev-list-simplify.sh +++ b/t/t6012-rev-list-simplify.sh @@ -95,10 +95,7 @@ check_outcome () { git log --pretty="$FMT" --parents $param | unnote >actual && sed -e "s/^.* \([^ ]*\) .*/\1/" >check actual && sed -e "s/^.* \([^ ]*\) .*/\1/" >check actual && sed -e "$munge_actual" check && - test_cmp expect check || { - cat actual - false - } + test_cmp expect check ' }