From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "jcwenger@gmail.com" <jcwenger@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH] mergetool: Suppress stderr and fix the "both added" test
Date: Sat, 21 Jan 2012 15:58:02 -0800 [thread overview]
Message-ID: <-1651957157444815476@unknownmsgid> (raw)
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
prev parent reply other threads:[~2012-01-21 23:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-21 10:26 [PATCH] mergetool: Suppress stderr and fix the "both added" test David Aguilar
2012-01-21 21:27 ` Junio C Hamano
2012-01-21 23:58 ` David Aguilar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=-1651957157444815476@unknownmsgid \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jcwenger@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).