From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Aug 2013 06:38:17 GMT
Subject: Re: [PATCH 1/3] Make test "using invalid commit with -C" more strict
Message-ID: <xmqqfvtyl1gm.fsf@gitster.dls.corp.google.com>
In-Reply-To: <20130824200128.GB2960@elie.Belkin>

Jonathan Nieder <jrnieder@gmail.com> writes:

> 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.
>
> [...]
>> --- 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.

Makes sense.

Also it would be much simpler to say "git commit --allow-empty".