Re: t7800-difftool.sh failure on pu

From: Tim Henigan <tim.henigan@gmail.com>
Date: Apr 2, 2012, 17:19 UTC
Message-ID: <CAFouetg2ME6f7=p191qPq=YC7Z7ZeBpm23tgb_wDmsEmwV7etw@mail.gmail.com>
In-Reply-To: <CAJDDKr50oDwih2fyb5iuFqYDsXSD3EXje4vZJwO=1_JBvuMYsA@mail.gmail.com>

On Sat, Mar 31, 2012 at 12:05 AM, David Aguilar <davvid@gmail.com> wrote:

Show 26 quoted lines

> On Thu, Mar 29, 2012 at 2:26 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:
>>
>>> The first option is to (effectively) revert commit 0440ed72 ("difftool: replace
>>> system call with Git::command_noisy", 22-03-2012), like so:
>>>
>>> -- >8 --
>>> diff --git a/git-difftool.perl b/git-difftool.perl
>>> index e1754ff..49613b1 100755
>>> --- a/git-difftool.perl
>>> +++ b/git-difftool.perl
>>> @@ -237,5 +237,7 @@ if (defined($dirdiff)) {
>>>
>>>       $ENV{GIT_PAGER} = '';
>>>       $ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';
>>> -     git_cmd_try { Git::command_noisy(('diff', @ARGV)) } 'exit code %d';
>>> +     my @command = ('git', 'diff', @ARGV);
>>> +     my $rc = system(@command);
>>> +     exit($rc | ($rc >> 8));
>>>  }
>>> -- 8< --
>>
>> I would prefer this, regardless of the issue.
>>
>> I actually recall asking Tim about the exit status when I reviewed this
>> change.

This breakage is a surprise to me. All the tests in t7800 have passed for me since my first modifications to them. They continue to pass for me on Ubuntu. That being said, the simple tests that Ramsay posted in his email (simply printing $!) also fail for me on msysgit.

> I would also prefer this.
>

This change will involve:
  - Dropping 7/9 from the series
  - Editing 8/9 to replace 'git_cmd_try' with simple system calls

Would it be better to resend the entire series or just edit and resend 8/9?

> A question for the msysgit/cygwin folks:
>
> would we need to go back to use "git.exe" as well?

I would welcome some feedback from other Windows users. I have been successfully using this series on Win7 with msysgit, but obviously some setups differ.