Re: [PATCH v2 00/20] object_id part 5

2016-09-07 Thread Junio C Hamano 
"brian m. carlson"  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.

Re: [PATCH v2 00/20] object_id part 5

2016-09-07 Thread brian m. carlson 
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.
-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature

Re: [PATCH v2 00/20] object_id part 5

2016-09-07 Thread Junio C Hamano 
"brian m. carlson"  writes:

> This is the fifth in a series of series to convert from unsigned char [20] to
> struct object_id.
>
> This series converts many of the files in the builtin directory to use struct
> object_id.  This gets us almost to the point where we can convert 
> get_tree_entry
> to use struct object_id, but not quite.  That function is used indirectly by
> get_sha1, meaning that get_oid would have to completely replace it in order 
> for
> get_tree_entry to be converted.
>
> However, this series tackles one of two major sources of object ID values: the
> command line (the other, of course, being the refs code).  Converting several 
> of
> the builtin commands to use struct object_id as much as possible makes it 
> easier
> to convert other functions down the line.

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.

Thanks.