diff options
| author | Jeff King <peff@peff.net> | 2019-06-20 03:41:35 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-20 10:35:05 -0700 |
| commit | d2bc62b1fa7f2df247199ed88edff30875ee19bc (patch) | |
| tree | 1b24a1947864ae3e690422e4a740346c2733fbbc /pack-bitmap.c | |
| parent | f8e56da97df846e67508eaf26d11fd007e1b75c1 (diff) | |
| download | git-d2bc62b1fa7f2df247199ed88edff30875ee19bc.tar.gz | |
pack-bitmap: convert khash_sha1 maps into kh_oid_map
All of the users of our khash_sha1 maps actually have a "struct
object_id". Let's use the more descriptive type.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-bitmap.c')
| -rw-r--r-- | pack-bitmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c index 998133588f..ed2befaac6 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -1041,7 +1041,7 @@ static int rebuild_bitmap(uint32_t *reposition, int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git, struct packing_data *mapping, - khash_sha1 *reused_bitmaps, + kh_oid_map_t *reused_bitmaps, int show_progress) { uint32_t i, num_objects; @@ -1080,9 +1080,9 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git, if (!rebuild_bitmap(reposition, lookup_stored_bitmap(stored), rebuild)) { - hash_pos = kh_put_sha1(reused_bitmaps, - stored->oid.hash, - &hash_ret); + hash_pos = kh_put_oid_map(reused_bitmaps, + stored->oid, + &hash_ret); kh_value(reused_bitmaps, hash_pos) = bitmap_to_ewah(rebuild); } |