i18n: unpack-trees: avoid substituting only a verb in sentences

diff --git a/archive.h b/archive.h
index b3cf2198b162b1f8afb90762d50860c9edbeae50..4a791e1fed4ecb0fc89b309b294acc93793886f0 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -1,6 +1,8 @@
 #ifndef ARCHIVE_H
 #define ARCHIVE_H
 
+#include "pathspec.h"
+
 struct archiver_args {
        const char *base;
        size_t baselen;
@@ -8,13 +10,15 @@ struct archiver_args {
        const unsigned char *commit_sha1;
        const struct commit *commit;
        time_t time;
-       const char **pathspec;
+       struct pathspec pathspec;
        unsigned int verbose : 1;
        unsigned int worktree_attributes : 1;
+       unsigned int convert : 1;
        int compression_level;
 };
 
 #define ARCHIVER_WANT_COMPRESSION_LEVELS 1
+#define ARCHIVER_REMOTE 2
 struct archiver {
        const char *name;
        int (*write_archive)(const struct archiver *, struct archiver_args *);
@@ -26,9 +30,18 @@ extern void register_archiver(struct archiver *);
 extern void init_tar_archiver(void);
 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);
+typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
+                                       const unsigned char *sha1,
+                                       const char *path, size_t pathlen,
+                                       unsigned int mode);
 
 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);
+extern void *sha1_file_to_archive(const struct archiver_args *args,
+                                 const char *path, const unsigned char *sha1,
+                                 unsigned int mode, enum object_type *type,
+                                 unsigned long *sizep);
 
 #endif /* ARCHIVE_H */