From: David Aguilar <davvid@gmail.com>
Date: Fri, 20 Jan 2012 07:26:59 GMT
Subject: Re: [PATCH] mergetool: Provide an empty file when no base exists
Message-ID: <CAJDDKr490XFqGe+y1pa7fnNhPMRE3ZR3=A+_XNUrCA1GZv+wkw@mail.gmail.com>
In-Reply-To: <7v7h0mhm8g.fsf@alter.siamese.dyndns.org>

On Thu, Jan 19, 2012 at 11:22 PM, Junio C Hamano <gitster@pobox.com> wrote:
> David Aguilar <davvid@gmail.com> writes:
>
>> +    if base_present; then
>> +     checkout_staged_file 1 "$MERGED" "$BASE"
>> +    else
>> +     :>"$BASE"
>
> Just a style, but please write this as either one of the following:
>
>        >"$BASE"
>        : >"$BASE"
>
> I tend to prefer the former, but if you have to write a command, we want
> to see a SP before the redirection (and no SP before the redirect target).
>
>> +    fi
>>      local_present  && checkout_staged_file 2 "$MERGED" "$LOCAL"
>>      remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE"
>
> Sorry to be ping-pong-ing like this, but wouldn't we have a similar issue
> when LOCAL or REMOTE does not exist (e.g. "they modified, we removed")?

Yes.  I'll have a [PATCH v3] soon.
-- 
            David