Merge branch 'ml/submodule'

diff --git a/archive.h b/archive.h
index f3d344b65259fb7f4314944194e12ddba1129a4b..5791e657e9a0c22081f4f42b9d8ca5b3c536baf2 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -8,8 +8,10 @@ struct archiver_args {
        const char *base;
        struct tree *tree;
        const unsigned char *commit_sha1;
+       const struct commit *commit;
        time_t time;
        const char **pathspec;
+       unsigned int verbose : 1;
        void *extra;
 };
 
@@ -19,14 +21,11 @@ typedef void *(*parse_extra_args_fn_t)(int argc, const char **argv);
 
 struct archiver {
        const char *name;
-       const char *remote;
        struct archiver_args args;
        write_archive_fn_t write_archive;
        parse_extra_args_fn_t parse_extra;
 };
 
-extern struct archiver archivers[];
-
 extern int parse_archive_args(int argc,
                              const char **argv,
                              struct archiver *ar);
@@ -42,5 +41,8 @@ extern void parse_pathspec_arg(const char **pathspec,
  */
 extern int write_tar_archive(struct archiver_args *);
 extern int write_zip_archive(struct archiver_args *);
+extern void *parse_extra_zip_args(int argc, const char **argv);
+
+extern void *sha1_file_to_archive(const char *path, const unsigned char *sha1, unsigned int mode, enum object_type *type, unsigned long *size, const struct commit *commit);
 
 #endif /* ARCHIVE_H */