Merge branch 'jk/packfile-reuse-cleanup'

[thirdparty/git.git] / pack-bitmap.h

diff --git a/pack-bitmap.h b/pack-bitmap.h
index 466c5afa09c37c4e5a56a33604510659b209e86b..bcd03b8993fd7a409cd12a40ddab366b4f6ab22e 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -3,6 +3,7 @@
 
 #include "ewah/ewok.h"
 #include "khash.h"
+#include "pack.h"
 #include "pack-objects.h"
 
 struct commit;
@@ -49,10 +50,13 @@ void test_bitmap_walk(struct rev_info *revs);
 struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs);
 int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
                                       struct packed_git **packfile,
-                                      uint32_t *entries, off_t *up_to);
+                                      uint32_t *entries,
+                                      struct bitmap **reuse_out);
 int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
                             kh_oid_map_t *reused_bitmaps, int show_progress);
 void free_bitmap_index(struct bitmap_index *);
+int bitmap_walk_contains(struct bitmap_index *,
+                        struct bitmap *bitmap, const struct object_id *oid);
 
 /*
  * After a traversal has been performed by prepare_bitmap_walk(), this can be