Re: [PATCH 1/3] Make test "using invalid commit with -C" more strict

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Aug 24, 2013, 20:01 UTC
Message-ID: <20130824200128.GB2960@elie.Belkin>
In-Reply-To: <1377316906-70338-2-git-send-email-draenog@pld-linux.org>

Kacper Kornet wrote:

> In the test 'using invalid commit with -C' git-commit would have failed
> even if the -C option  had been given the correct commit, as there was
> nothing to commit.

Good catch.

[...]

Show 11 quoted lines

> --- a/t/t7501-commit.sh
> +++ b/t/t7501-commit.sh
> @@ -53,7 +53,10 @@ test_expect_success PERL 'can use paths with --interactive' '
>  '
>  
>  test_expect_success 'using invalid commit with -C' '
> -	test_must_fail git commit -C bogus
> +	echo bong >file &&
> +	git add file &&
> +	test_must_fail git commit -C bogus &&
> +	git reset

I guess to be pedantic this should say

	echo bong >file &&
	git add file &&
	test_when_finished "git reset --hard" &&
	test_must_fail git commit -C bogus

to avoid interfering with later tests even when this one fails and the && prevents the 'git reset' from being executed.

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