Merge branch 'md/list-objects-filter-combo'

diff --git a/pack-bitmap.h b/pack-bitmap.h
index ee9792264c84c43b75fc4e8ffb66dd8c6e88bf1c..00de3ec8e41d88b972ea28387930ad4342a2defe 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -51,7 +51,7 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
                                       struct packed_git **packfile,
                                       uint32_t *entries, off_t *up_to);
 int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
-                            khash_sha1 *reused_bitmaps, int show_progress);
+                            kh_oid_map_t *reused_bitmaps, int show_progress);
 void free_bitmap_index(struct bitmap_index *);
 
 /*