> @@ -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->hash); > + trg_pos = kh_get_oid_map(island_marks, *trg_oid); [snip] > @@ -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 = kh_put_oid_map(island_marks, obj->oid, &hash_ret); Thanks for doing this cleanup. The entire series (17 patches) look good to me. The only remotely surprising thing to me was that OIDs are passed by value on the stack, both for kh_get_oid_map() and kh_put_oid_map(), but I see that this is how things currently work (and anyway, changing this is beyond the scope of this patch set).
