From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Jan 2020 22:48:19 GMT
Subject: Re: [PATCH] t7800: don't rely on reuse_worktree_file()
Message-ID: <xmqqo8v3f26k.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20200116181940.GA2945961@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> ... At any rate, since reuse_worktree_file()
> is meant to be an optimization that may or may not trigger, our test
> should be robust either way.
>
> Instead of checking the filename, let's just make sure we got a single
> line of output (which would not be true if we continued after the first
> failure).

Makes sense.  Thanks for spotting.

> Signed-off-by: Jeff King <peff@peff.net>
> ---
>  t/t7800-difftool.sh | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index 6bac9ed180..29b92907e2 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -125,15 +125,14 @@ test_expect_success 'difftool stops on error with --trust-exit-code' '
>  	test_when_finished "rm -f for-diff .git/fail-right-file" &&
>  	test_when_finished "git reset -- for-diff" &&
>  	write_script .git/fail-right-file <<-\EOF &&
> -	echo "$2"
> +	echo failed
>  	exit 1
>  	EOF
>  	>for-diff &&
>  	git add for-diff &&
> -	echo file >expect &&
>  	test_must_fail git difftool -y --trust-exit-code \
>  		--extcmd .git/fail-right-file branch >actual &&
> -	test_cmp expect actual
> +	test_line_count = 1 actual
>  '
>  
>  test_expect_success 'difftool honors exit status if command not found' '