Sync with GIT 1.6.2.5

diff --git a/archive.h b/archive.h
index 6b5fe5af4534117a8ece6da25ab3dc3cd5ce9236..038ac353d40567029403e3e7a2933af73a130720 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -1,9 +1,6 @@
 #ifndef ARCHIVE_H
 #define ARCHIVE_H
 
-#define MAX_EXTRA_ARGS 32
-#define MAX_ARGS       (MAX_EXTRA_ARGS + 32)
-
 struct archiver_args {
        const char *base;
        size_t baselen;
@@ -13,6 +10,7 @@ struct archiver_args {
        time_t time;
        const char **pathspec;
        unsigned int verbose : 1;
+       unsigned int worktree_attributes : 1;
        int compression_level;
 };
 
@@ -20,20 +18,6 @@ typedef int (*write_archive_fn_t)(struct archiver_args *);
 
 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);
 
-struct archiver {
-       const char *name;
-       write_archive_fn_t write_archive;
-       unsigned int flags;
-};
-
-extern int parse_archive_args(int argc, const char **argv, const struct archiver **ar, struct archiver_args *args);
-
-extern void parse_treeish_arg(const char **treeish,
-                             struct archiver_args *ar_args,
-                             const char *prefix);
-
-extern void parse_pathspec_arg(const char **pathspec,
-                              struct archiver_args *args);
 /*
  * Archive-format specific backends.
  */