Re: [PATCH 07/14] t7800-difftool.sh: Fix a test failure on Cygwin

From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Dec 18, 2010, 20:32 UTC
Message-ID: <4D0D1A67.4090000@ramsay1.demon.co.uk>
In-Reply-To: <7vwrn8i31n.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

Show 38 quoted lines

> David Aguilar <davvid@gmail.com> writes:
> 
>>> diff --git a/git-difftool.perl b/git-difftool.perl
>>> index e95e4ad..ced1615 100755
>>> --- a/git-difftool.perl
>>> +++ b/git-difftool.perl
>>> @@ -52,6 +52,7 @@ sub generate_command
>>>  	my @command = (exe('git'), 'diff');
>>>  	my $skip_next = 0;
>>>  	my $idx = -1;
>>> +	my $prompt = '';
>> Would it be simpler to set $prompt = 1 and then
>> flip it to 0 when -y | or --no-prompt is supplied?
>> ...
>>
>> This would become:
>>
>> 	if ($prompt) {
>> 		...
>> 	}
>> 	else {
>> 		...
>> 	}
> 
> But that is not what the patch does, is it?
> 
> Isn't it more like initializing $prompt to undef and then the above
> condition becomes:
> 
> 	if (!defined $prompt) {
>         	; # nothing
>         elsif ($prompt) {
> 		setenv PROMPT true
> 	} else {
> 		setenv NO_PROMPT true
> 	}
> 
> no?

Yes. :-P At least that is what I was aiming for.

In particular, if none of -y, --no-prompt or --prompt is passed on the command-line, I don't want to set either key in the hash. (Or, to put it another way, I don't want to change the behaviour in this case, where neither variable is set in the environment of the helper script)

ATB, Ramsay Jones