From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 07 Sep 2016 23:05:08 GMT
Subject: Re: [PATCH v2 00/20] object_id part 5
Message-ID: <xmqqwpinjopn.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160907222207.6fdorwi4q4p72gro@vauxhall.crustytoothpaste.net>

"brian m. carlson" <sandals@crustytoothpaste.net> writes:

> On Wed, Sep 07, 2016 at 01:12:09PM -0700, Junio C Hamano wrote:
>> It is a bit unfortunate that this conflicts somewhat in builtin/cat-file.c
>> and heavily with builtin/apply.c with other topics in flight.
>> 
>> Let me see how bad the conflict resolution is and report back later.
>
> If it ends up being problematic, feel free to drop the appropriate
> patches and I'll fix them up and send them in in the next set.

Let's see how well I do first ;-) There was another one in
wt-status.c that was touched by the "status --porcelain=v2" series,
but I haven't finished today's merges yet.