Re: [PATCH 07/14] t7800-difftool.sh: Fix a test failure on Cygwin
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 17, 2010, 19:59 UTC
- Message-ID
- <7vwrn8i31n.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20101217023357.GA30083@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 22 quoted lines
>> 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?