Merge branch 'po/rerere-doc-fmt'

diff --git a/pack-bitmap.h b/pack-bitmap.h
index 4555907dee99fbf731b739c584837adbbe8270f1..ee9792264c84c43b75fc4e8ffb66dd8c6e88bf1c 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -5,12 +5,16 @@
 #include "khash.h"
 #include "pack-objects.h"
 
+struct commit;
+struct repository;
+struct rev_info;
+
 struct bitmap_disk_header {
        char magic[4];
        uint16_t version;
        uint16_t options;
        uint32_t entry_count;
-       unsigned char checksum[20];
+       unsigned char checksum[GIT_MAX_RAWSZ];
 };
 
 static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
@@ -36,7 +40,7 @@ typedef int (*show_reachable_fn)(
 
 struct bitmap_index;
 
-struct bitmap_index *prepare_bitmap_git(void);
+struct bitmap_index *prepare_bitmap_git(struct repository *r);
 void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits,
                              uint32_t *trees, uint32_t *blobs, uint32_t *tags);
 void traverse_bitmap_commit_list(struct bitmap_index *,
@@ -50,6 +54,13 @@ int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping
                             khash_sha1 *reused_bitmaps, int show_progress);
 void free_bitmap_index(struct bitmap_index *);
 
+/*
+ * After a traversal has been performed by prepare_bitmap_walk(), this can be
+ * queried to see if a particular object was reachable from any of the
+ * objects flagged as UNINTERESTING.
+ */
+int bitmap_has_oid_in_uninteresting(struct bitmap_index *, const struct object_id *oid);
+
 void bitmap_writer_show_progress(int show);
 void bitmap_writer_set_checksum(unsigned char *sha1);
 void bitmap_writer_build_type_index(struct packing_data *to_pack,