builtin/difftool.c: drop hashmap_cmp_fn cast

diff --git a/bundle.h b/bundle.h
index c5a22c8d10c7bf5e27536a3b84033b77f3542445..e9a4cb6a74335cfd8972b19340b38e2210061a6d 100644 (file)
--- a/bundle.h
+++ b/bundle.h
@@ -1,10 +1,12 @@
 #ifndef BUNDLE_H
 #define BUNDLE_H
 
+#include "cache.h"
+
 struct ref_list {
        unsigned int nr, alloc;
        struct ref_list_entry {
-               unsigned char sha1[20];
+               struct object_id oid;
                char *name;
        } *list;
 };
@@ -14,6 +16,7 @@ struct bundle_header {
        struct ref_list references;
 };
 
+int is_bundle(const char *path, int quiet);
 int read_bundle_header(const char *path, struct bundle_header *header);
 int create_bundle(struct bundle_header *header, const char *path,
                int argc, const char **argv);