Merge branch 'bw/rebase-autostash-keep-current-branch'

diff --git a/archive.h b/archive.h
index 5afc11d0f81fe352869d756d15cb9f19d2b8171c..e60e3dd31c79f1c04b7afcae8eb5623238e1234f 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -11,7 +11,7 @@ struct archiver_args {
        const char *base;
        size_t baselen;
        struct tree *tree;
-       const unsigned char *commit_sha1;
+       const struct object_id *commit_oid;
        const struct commit *commit;
        timestamp_t time;
        struct pathspec pathspec;
@@ -24,8 +24,8 @@ struct archiver_args {
 /* main api */
 
 int write_archive(int argc, const char **argv, const char *prefix,
-                        struct repository *repo,
-                        const char *name_hint, int remote);
+                 struct repository *repo,
+                 const char *name_hint, int remote);
 
 const char *archive_format_from_filename(const char *filename);
 
@@ -52,8 +52,8 @@ typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
 
 int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
 void *object_file_to_archive(const struct archiver_args *args,
-                                   const char *path, const struct object_id *oid,
-                                   unsigned int mode, enum object_type *type,
-                                   unsigned long *sizep);
+                            const char *path, const struct object_id *oid,
+                            unsigned int mode, enum object_type *type,
+                            unsigned long *sizep);
 
 #endif /* ARCHIVE_H */