diff options
| author | Jeff King <peff@peff.net> | 2015-03-20 06:07:52 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 10:20:15 -0700 |
| commit | 5ca812a19c97a2cbfe797748bc9bf6ebde9e0f64 (patch) | |
| tree | e92510e77e840c56bd14789c6f0239d89241e041 /t/t6012-rev-list-simplify.sh | |
| parent | 99094a7ad484085b9f6849a8ebe1e23467c5bc14 (diff) | |
| download | git-5ca812a19c97a2cbfe797748bc9bf6ebde9e0f64.tar.gz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6012-rev-list-simplify.sh')
| -rwxr-xr-x | t/t6012-rev-list-simplify.sh | 10 |
1 files changed, 2 insertions, 8 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 && - test_cmp expect check || { - cat actual - false - } + test_cmp expect check ' } @@ -121,10 +118,7 @@ test_expect_success 'full history simplification without parent' ' git log --pretty="$FMT" --full-history E -- lost | unnote >actual && sed -e "s/^.* \([^ ]*\) .*/\1/" >check <actual && - test_cmp expect check || { - cat actual - false - } + test_cmp expect check ' test_expect_success '--full-diff is not affected by --parents' ' |