Re: [PATCH 12/17] delta-islands: convert island_marks khash to use oids

2019-06-20 Thread Jeff King
On Thu, Jun 20, 2019 at 10:38:23AM -0700, Jonathan Tan wrote: > > @@ -154,7 +154,7 @@ static struct island_bitmap > > *create_or_get_island_marks(struct object *obj) > > khiter_t pos; > > int hash_ret; > > > > - pos = kh_put_sha1(island_marks, obj->oid.hash, &hash_ret); > > + pos =

Re: [PATCH 12/17] delta-islands: convert island_marks khash to use oids

2019-06-20 Thread Jonathan Tan
> @@ -105,7 +105,7 @@ int in_same_island(const struct object_id *trg_oid, const > struct object_id *src_ >* If we don't have a bitmap for the target, we can delta it >* against anything -- it's not an important object >*/ > - trg_pos = kh_get_sha1(island_marks, trg_oid-

[PATCH 12/17] delta-islands: convert island_marks khash to use oids

2019-06-20 Thread Jeff King
All of the users of this map have an actual "struct object_id" rather than a bare sha1. Let's use the more descriptive type (and get one step closer to dropping khash_sha1 entirely). Signed-off-by: Jeff King --- delta-islands.c | 22 +++--- 1 file changed, 11 insertions(+), 11 de