git-remote-mediawiki: obey advice.pushNonFastForward

diff --git a/archive.h b/archive.h
index f39cede0c6de829953d0ed3806b564b609ae2566..2b0884f1ef3123f26d9a7b3ba03e3d14ae1ccd57 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -15,10 +15,12 @@ struct archiver_args {
 };
 
 #define ARCHIVER_WANT_COMPRESSION_LEVELS 1
+#define ARCHIVER_REMOTE 2
 struct archiver {
        const char *name;
-       int (*write_archive)(struct archiver_args *);
+       int (*write_archive)(const struct archiver *, struct archiver_args *);
        unsigned flags;
+       void *data;
 };
 extern void register_archiver(struct archiver *);
 
@@ -28,6 +30,8 @@ extern void init_zip_archiver(void);
 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, const unsigned char *sha1, const char *path, size_t pathlen, unsigned int mode, void *buffer, unsigned long size);
 
 extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
-extern int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix);
+extern int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix, const char *name_hint, int remote);
+
+const char *archive_format_from_filename(const char *filename);
 
 #endif /* ARCHIVE_H */