Merge git://ozlabs.org/~paulus/gitk

diff --git a/tag.h b/tag.h
index d469534e82a87b651abe752469d0547c2b560e10..e669c3e497a95bdeb08c4b45dec37a7d80b52ac4 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -11,11 +11,11 @@ struct tag {
        char *tag;
        timestamp_t date;
 };
-
-extern struct tag *lookup_tag(const struct object_id *oid);
-extern int parse_tag_buffer(struct tag *item, const void *data, unsigned long size);
+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 struct object *deref_tag(struct object *, const char *, int);
+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);