tag: allow lookup_tag to handle arbitrary repositories

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/tag.c b/tag.c
index fbb4659325ba2027f64360c5b46fa921adb8f944..46b5882ee12022a607bbdd4950853eacfea28291 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -92,13 +92,13 @@ struct object *deref_tag_noverify(struct object *o)
        return o;
 }
 
        return o;
 }
 

-struct tag *lookup_tag_the_repository(const struct object_id *oid)
+struct tag *lookup_tag(struct repository *r, const struct object_id *oid)

 {
 {

-       struct object *obj = lookup_object(the_repository, oid->hash);
+       struct object *obj = lookup_object(r, oid->hash);

        if (!obj)
        if (!obj)

-               return create_object(the_repository, oid->hash,
-                                    alloc_tag_node(the_repository));
-       return object_as_type(the_repository, obj, OBJ_TAG, 0);
+               return create_object(r, oid->hash,
+                                    alloc_tag_node(r));
+       return object_as_type(r, obj, OBJ_TAG, 0);

 }
 
 static timestamp_t parse_tag_date(const char *buf, const char *tail)
 }
 
 static timestamp_t parse_tag_date(const char *buf, const char *tail)

diff --git a/tag.h b/tag.h
index 45b0b08b1f620b46ee65079f2701694861621816..6a160c91875398c39940883baab4452880397956 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -11,8 +11,7 @@ struct tag {
        char *tag;
        timestamp_t date;
 };
        char *tag;
        timestamp_t date;
 };

-#define lookup_tag(r, o) lookup_tag_##r(o)
-extern struct tag *lookup_tag_the_repository(const struct object_id *oid);
+extern struct tag *lookup_tag(struct repository *r, const struct object_id *oid);

 #define parse_tag_buffer(r, i, d, s) parse_tag_buffer_##r(i, d, s)
 extern int parse_tag_buffer_the_repository(struct tag *item, const void *data, unsigned long size);
 extern int parse_tag(struct tag *item);
 #define parse_tag_buffer(r, i, d, s) parse_tag_buffer_##r(i, d, s)
 extern int parse_tag_buffer_the_repository(struct tag *item, const void *data, unsigned long size);
 extern int parse_tag(struct tag *item);