rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`

diff --git a/archive.h b/archive.h
index dd022a6b46bc339d19b1c49ebc20214dd137685f..e60e3dd31c79f1c04b7afcae8eb5623238e1234f 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -23,9 +23,9 @@ struct archiver_args {
 
 /* main api */
 
-extern int write_archive(int argc, const char **argv, const char *prefix,
-                        struct repository *repo,
-                        const char *name_hint, int remote);
+int write_archive(int argc, const char **argv, const char *prefix,
+                 struct repository *repo,
+                 const char *name_hint, int remote);
 
 const char *archive_format_from_filename(const char *filename);
 
@@ -39,21 +39,21 @@ struct archiver {
        unsigned flags;
        void *data;
 };
-extern void register_archiver(struct archiver *);
+void register_archiver(struct archiver *);
 
-extern void init_tar_archiver(void);
-extern void init_zip_archiver(void);
-extern void init_archivers(void);
+void init_tar_archiver(void);
+void init_zip_archiver(void);
+void init_archivers(void);
 
 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
                                        const struct object_id *oid,
                                        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 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);
+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);
 
 #endif /* ARCHIVE_H */