Merge branch 'ba/clone-remote-submodules'

diff --git a/bundle.h b/bundle.h
index e2aedd60d6ad1482bb6da173c853e6ba4805c8d7..37c37d7f653c68ab6752fab8203b59783e2f5c40 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,11 +16,14 @@ 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);
-int verify_bundle(struct bundle_header *header, int verbose);
-int unbundle(struct bundle_header *header, int bundle_fd);
+int create_bundle(struct repository *r, const char *path,
+                 int argc, const char **argv);
+int verify_bundle(struct repository *r, struct bundle_header *header, int verbose);
+#define BUNDLE_VERBOSE 1
+int unbundle(struct repository *r, struct bundle_header *header,
+            int bundle_fd, int flags);
 int list_bundle_refs(struct bundle_header *header,
                int argc, const char **argv);