From: Ciaran <ciaranj@gmail.com>
Date: Mon, 02 May 2011 00:01:26 GMT
Subject: Re: [RFC PATCH] Pass empty file to p4merge where no base is suitable.
Message-ID: <BANLkTi=wpxzyn01=g5g1JmjY1UPVQ6faHQ@mail.gmail.com>
In-Reply-To: <7vk4eaq8m3.fsf@alter.siamese.dyndns.org>

On Mon, May 2, 2011 at 12:55 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Ciaran <ciaranj@gmail.com> writes:
>
>> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
>> index fb3f52b..4db9212 100644
>> --- a/git-mergetool--lib.sh
>> +++ b/git-mergetool--lib.sh
>> @@ -258,12 +258,9 @@ run_merge_tool () {
>>               ;;
>>       p4merge)
>>               if merge_mode; then
>> -                 touch "$BACKUP"
>> -                     if $base_present; then
>> -                             "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
>> -                     else
>> -                             "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
>> -                     fi
>> +                     touch "$BACKUP"
>> +                     $base_present || >"$BASE"
>> +                     "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
>>                       check_unchanged
>
> Will queue this version as-is; thanks.

Thank you.

>
>
> Somebody might want to revisit if that "touch" is still really necessary,
> though.  It is outside the scope of this change, as that has been there
> before this patch.
The only reason my patch touches it was to 'fix' the whitespace (i.e.
it was mixed tabs + space chars, where all the other instances of that
line aren't)

I did debate backing that change out though :)
- cj.

> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>