Re: [PATCHv5 03/16] t4017 (diff-retval): replace manual exit code check with test_expect_code

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 3, 2010, 13:47 UTC
Message-ID: <20101003134757.GA17084@burratino>
In-Reply-To: <1286082644-31595-4-git-send-email-newren@gmail.com>

Elijah Newren wrote:

> Signed-off-by: Elijah Newren <newren@gmail.com>

For the confused: this patch takes advantage of patch 1 to clarify the t4017 (diff exit code) tests. No functional change should be involved, except better error messages when tests fail with -v.

> --- a/t/t4017-diff-retval.sh
> +++ b/t/t4017-diff-retval.sh

[...]

Show 11 quoted lines

> @@ -145,20 +122,14 @@ test_expect_success 'check honors conflict marker length' '
>  	git reset --hard &&
>  	echo ">>>>>>> boo" >>b &&
>  	echo "======" >>a &&
> -	git diff --check a &&
> -	(
> -		git diff --check b
> -		test $? = 2
> -	) &&
> +	git diff --check a
> +	test_expect_code 2 git diff --check b &&

Missing &&?

With that exception,
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>