From: David Aguilar <davvid@gmail.com>
Date: Sat, 21 Jan 2012 23:58:02 GMT
Subject: Re: [PATCH] mergetool: Suppress stderr and fix the "both added" test
Message-ID: <-1651957157444815476@unknownmsgid>
In-Reply-To: <7v39b8d9w6.fsf@alter.siamese.dyndns.org>

On Jan 21, 2012, at 1:27 PM, Junio C Hamano <gitster@pobox.com> wrote:

> David Aguilar <davvid@gmail.com> writes:
>
>> Silence error messages when "git checkout-index" is used to
>> checkout a stage that does not exist.  This can happen now that
>> mergetool calls checkout_staged_file() unconditionally when
>> creating the temporary $BASE, $LOCAL, and $REMOTE files.
>>
>> Fix the test so that it checks the contents of the "both added"
>> file.  The test was passing as a consequence of accidentally
>> handing a bad path to "cat".
>>
>> Signed-off-by: David Aguilar <davvid@gmail.com>
>> ---
>> This applies on top of da/maint-mergetool-twoway in pu.
>
> Thanks.
>
> It might make sense to squash this into the previous patch, which luckily
> hasn't hit 'next' yet, though---which I can do locally without need for
> re-send if you like.

Yes, please squash this commit. This is certainly a fix up.

Thanks,
David