Re: [PATCH v2] mergetools: add support for DeltaWalker

From: Tim Henigan <tim.henigan@gmail.com>
Date: Mar 4, 2012, 03:50 UTC
Message-ID: <CAFouetjZ0kQMnAPdNey5kSEmq+fmQqq+fC51hcT+9k6T8c6uOw@mail.gmail.com>
In-Reply-To: <7vmx7x5ml0.fsf@alter.siamese.dyndns.org>

On Sat, Mar 3, 2012 at 5:47 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 17 quoted lines

> David Aguilar <davvid@gmail.com> writes:
>
>>>> +merge_cmd () {
>>>> +     if $base_present
>>>> +     then
>>>> +             "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$PWD/$MERGED"
>>>> +     else
>>>> +             "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$PWD/$MERGED"
>>>> +     fi >/dev/null 2>&1
>>>> +}
>>
>> Is the $PWD/ prefix strictly needed?  The rest of the mergetools use
>> $MERGED as-is.  Does it work without it?
>
> Hrm, I didn't notice it but they do look fishy.  Thanks for good eyes.
>
> Tim?

I ran a quick test using msysgit v1.7.9 on Win7 64-bit and found that it fails without '$PWD'.

When '$PWD/' is removed from the '-merged' option, it results in a Java JRE crash and the conflict resolutions entered by the user are not written to the file.

The JRE exception is 'EXCEPTION_ACCESS_VIOLATION (0xc0000005)'. I posted the full text of the exception to a public location, in case anyone is interested [1].

The format of the '-merged' option was copied directly from the DeltaWalker manual. There was no explanation why '$PWD' is needed.

[1]: https://gist.github.com/1970590