Merge branch 'tb/log-G-binary'

diff --git a/midx.h b/midx.h
index 1d6c21afe31b62024969f7cb91f9f78b19fe8e52..774f652530c42983368149bd9fe42f3ed063ab5d 100644 (file)
--- a/midx.h
+++ b/midx.h
@@ -6,6 +6,8 @@
 struct object_id;
 struct pack_entry;
 
+#define GIT_TEST_MULTI_PACK_INDEX "GIT_TEST_MULTI_PACK_INDEX"
+
 struct multi_pack_index {
        struct multi_pack_index *next;
 
@@ -45,7 +47,9 @@ int midx_contains_pack(struct multi_pack_index *m, const char *idx_name);
 int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local);
 
 int write_midx_file(const char *object_dir);
-void clear_midx_file(const char *object_dir);
+void clear_midx_file(struct repository *r);
 int verify_midx_file(const char *object_dir);
 
+void close_midx(struct multi_pack_index *m);
+
 #endif