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

diff --git a/tag.h b/tag.h
index e669c3e497a95bdeb08c4b45dec37a7d80b52ac4..03265fbfe2942f9ca7409cb2b771b14edd9fb998 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -11,13 +11,13 @@ struct tag {
        char *tag;
        timestamp_t date;
 };
-extern struct tag *lookup_tag(struct repository *r, const struct object_id *oid);
-extern int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, unsigned long size);
-extern int parse_tag(struct tag *item);
-extern void release_tag_memory(struct tag *t);
-extern struct object *deref_tag(struct repository *r, struct object *, const char *, int);
-extern struct object *deref_tag_noverify(struct object *);
-extern int gpg_verify_tag(const struct object_id *oid,
-               const char *name_to_report, unsigned flags);
+struct tag *lookup_tag(struct repository *r, const struct object_id *oid);
+int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, unsigned long size);
+int parse_tag(struct tag *item);
+void release_tag_memory(struct tag *t);
+struct object *deref_tag(struct repository *r, struct object *, const char *, int);
+struct object *deref_tag_noverify(struct object *);
+int gpg_verify_tag(const struct object_id *oid,
+                  const char *name_to_report, unsigned flags);
 
 #endif /* TAG_H */