rerere: do use multiple variants

diff --git a/pack-bitmap.h b/pack-bitmap.h
index 09acf02f7bd65aae7dbf0088e07bd37470b72aa7..487600b18c79be22c4c611fc4c3d29d817f1f304 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -5,12 +5,6 @@
 #include "khash.h"
 #include "pack-objects.h"
 
-struct bitmap_disk_entry {
-       uint32_t object_pos;
-       uint8_t xor_offset;
-       uint8_t flags;
-} __attribute__((packed));
-
 struct bitmap_disk_header {
        char magic[4];
        uint16_t version;
@@ -24,7 +18,8 @@ static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
 #define NEEDS_BITMAP (1u<<22)
 
 enum pack_bitmap_opts {
-       BITMAP_OPT_FULL_DAG = 1
+       BITMAP_OPT_FULL_DAG = 1,
+       BITMAP_OPT_HASH_CACHE = 4,
 };
 
 enum pack_bitmap_flags {
@@ -57,6 +52,7 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
 void bitmap_writer_build(struct packing_data *to_pack);
 void bitmap_writer_finish(struct pack_idx_entry **index,
                          uint32_t index_nr,
-                         const char *filename);
+                         const char *filename,
+                         uint16_t options);
 
 #endif