Merge branch 'sb/branch-attributes'

diff --git a/archive.h b/archive.h
index 24b016f001117715999baf9eaa486164ba15567e..16dcdb875c3715556ce8561e9ee9f7ae8b3766da 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -10,6 +10,7 @@ struct archiver_args {
        const unsigned char *commit_sha1;
        time_t time;
        const char **pathspec;
+       unsigned int verbose : 1;
        void *extra;
 };
 
@@ -19,7 +20,6 @@ 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;
@@ -37,5 +37,11 @@ extern void parse_treeish_arg(const char **treeish,
 
 extern void parse_pathspec_arg(const char **pathspec,
                               struct archiver_args *args);
+/*
+ * Archive-format specific backends.
+ */
+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);
 
 #endif /* ARCHIVE_H */