Merge branch 'ar/merge-recursive'

diff --git a/archive.h b/archive.h
index d8cca735d2dcbb13282be85e9e892c318bc53300..6838dc788f7620b0807a7044b611efc623bdcf0c 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,14 +20,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);