public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Benoit Pierre <benoit.pierre@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 6/6] merge hook tests: use 'test_must_fail' instead of '!'
Date: Thu, 06 Mar 2014 16:35:47 -0800	[thread overview]
Message-ID: <xmqqk3c6vo9o.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqiorrvwvh.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Thu, 06 Mar 2014 13:29:54 -0800")

Junio C Hamano <gitster@pobox•com> writes:

> Benoit Pierre <benoit.pierre@gmail•com> writes:
>
>> Signed-off-by: Benoit Pierre <benoit.pierre@gmail•com>
>> ---
>>  t/t7505-prepare-commit-msg-hook.sh | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
>> index 604c06e..1be6cec 100755
>> --- a/t/t7505-prepare-commit-msg-hook.sh
>> +++ b/t/t7505-prepare-commit-msg-hook.sh
>> @@ -167,7 +167,7 @@ test_expect_success 'with failing hook' '
>>  	head=`git rev-parse HEAD` &&
>>  	echo "more" >> file &&
>>  	git add file &&
>> -	! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
>> +	test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
>
> Thanks. It is good that you avoided the common pitfall of attempting
>
> 	GIT_EDITOR=... test_must_fail git commit -c $head    ;# WRONG
>
> but do we assume everybody has "env"?

It turns out that the answer to this question seems to be "yes, we
already do."; so the patch is probably OK as-is.

Thanks.

> To be portable, we can do this instead.
>
> 	(
> 		GIT_EDITOR=... &&
>         	export GIT_EDITOR &&
>                 test_must_fail git commit -c $head
> 	)

next prev parent reply	other threads:[~2014-03-07  0:35 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-06 14:50 [PATCH 0/6] fix hunk editing with 'commit -p -m' Benoit Pierre
2014-03-06 14:50 ` [PATCH 1/6] test patch hunk editing with "commit -p -m" Benoit Pierre
2014-03-06 22:07   ` Eric Sunshine
2014-03-06 23:11     ` Junio C Hamano
2014-03-06 14:50 ` [PATCH 2/6] commit: fix " Benoit Pierre
2014-03-06 21:25   ` Junio C Hamano
2014-03-06 21:47     ` Junio C Hamano
2014-03-06 14:50 ` [PATCH 3/6] merge: fix GIT_EDITOR override for commit hook Benoit Pierre
2014-03-06 14:50 ` [PATCH 4/6] merge hook tests: fix and update tests Benoit Pierre
2014-03-06 22:11   ` Eric Sunshine
2014-03-06 14:50 ` [PATCH 5/6] merge hook tests: fix missing '&&' in test Benoit Pierre
2014-03-06 21:27   ` Junio C Hamano
2014-03-06 14:50 ` [PATCH 6/6] merge hook tests: use 'test_must_fail' instead of '!' Benoit Pierre
2014-03-06 21:29   ` Junio C Hamano
2014-03-07  0:35     ` Junio C Hamano [this message]
2014-03-06 21:15 ` [PATCH 0/6] fix hunk editing with 'commit -p -m' Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqk3c6vo9o.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=benoit.pierre@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox