Merge branch 'ja/i18n-fix'

diff --git a/pack-bitmap.h b/pack-bitmap.h
index 19f70043a811a3878a3eb9dd7ff9bcd177dfc8c6..189dd68ad30b14281b42ea43bb21739006ea6061 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -5,6 +5,9 @@
 #include "khash.h"
 #include "pack-objects.h"
 
+struct commit;
+struct rev_info;
+
 struct bitmap_disk_header {
        char magic[4];
        uint16_t version;
@@ -48,6 +51,14 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
                                       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);
+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_sha1_in_uninteresting(struct bitmap_index *, const unsigned char *sha1);
 
 void bitmap_writer_show_progress(int show);
 void bitmap_writer_set_checksum(unsigned char *sha1);