Re: [PATCH 4/6] Convert struct name_entry to use struct object_id.

2016-04-19 Thread Junio C Hamano
"brian m. carlson" writes: > On Tue, Apr 19, 2016 at 04:02:22PM -0700, Junio C Hamano wrote: >> "brian m. carlson" writes: >> >> > @@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long >> > mask, unsigned long dirmask, s >> >} >> > >> >if (same_entry(entry+0, entry+1)

Re: [PATCH 4/6] Convert struct name_entry to use struct object_id.

2016-04-19 Thread brian m. carlson
On Tue, Apr 19, 2016 at 04:02:22PM -0700, Junio C Hamano wrote: > "brian m. carlson" writes: > > > @@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long mask, > > unsigned long dirmask, s > > } > > > > if (same_entry(entry+0, entry+1)) { > > - if (entry[2].sha

Re: [PATCH 4/6] Convert struct name_entry to use struct object_id.

2016-04-19 Thread Junio C Hamano
"brian m. carlson" writes: > @@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long mask, > unsigned long dirmask, s > } > > if (same_entry(entry+0, entry+1)) { > - if (entry[2].sha1 && !S_ISDIR(entry[2].mode)) { > + if (entry[2].oid->hash &&

[PATCH 4/6] Convert struct name_entry to use struct object_id.

2016-04-17 Thread brian m. carlson
Signed-off-by: brian m. carlson --- builtin/grep.c | 6 +++--- builtin/merge-tree.c | 18 +- builtin/pack-objects.c | 4 ++-- builtin/reflog.c | 4 ++-- cache-tree.c | 4 ++-- fsck.c | 4 ++-- http-push.c| 4 ++-- list-ob