tag: allow parse_tag_buffer 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 46b5882ee12022a607bbdd4950853eacfea28291..682e7793059ea35210779c134e957a25020492b4 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -126,7 +126,7 @@ void release_tag_memory(struct tag *t)
        t->date = 0;
 }
 
        t->date = 0;
 }
 

-int parse_tag_buffer_the_repository(struct tag *item, const void *data, unsigned long size)
+int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, unsigned long size)

 {
        struct object_id oid;
        char type[20];
 {
        struct object_id oid;
        char type[20];


@@ -154,13 +154,13 @@ int parse_tag_buffer_the_repository(struct tag *item, const void *data, unsigned
        bufptr = nl + 1;
 
        if (!strcmp(type, blob_type)) {
        bufptr = nl + 1;
 
        if (!strcmp(type, blob_type)) {

-               item->tagged = (struct object *)lookup_blob(the_repository, &oid);
+               item->tagged = (struct object *)lookup_blob(r, &oid);

        } else if (!strcmp(type, tree_type)) {
        } else if (!strcmp(type, tree_type)) {

-               item->tagged = (struct object *)lookup_tree(the_repository, &oid);
+               item->tagged = (struct object *)lookup_tree(r, &oid);

        } else if (!strcmp(type, commit_type)) {
        } else if (!strcmp(type, commit_type)) {

-               item->tagged = (struct object *)lookup_commit(the_repository, &oid);
+               item->tagged = (struct object *)lookup_commit(r, &oid);

        } else if (!strcmp(type, tag_type)) {
        } else if (!strcmp(type, tag_type)) {

-               item->tagged = (struct object *)lookup_tag(the_repository, &oid);
+               item->tagged = (struct object *)lookup_tag(r, &oid);

        } else {
                error("Unknown type %s", type);
                item->tagged = NULL;
        } else {
                error("Unknown type %s", type);
                item->tagged = NULL;

diff --git a/tag.h b/tag.h
index 6a160c91875398c39940883baab4452880397956..efd4c7da67c1c185c45f4a54b0fe3dbcfcb4ef55 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -12,8 +12,7 @@ struct tag {
        timestamp_t date;
 };
 extern struct tag *lookup_tag(struct repository *r, const struct object_id *oid);
        timestamp_t date;
 };
 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_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);
 #define deref_tag(r, o, w, l) deref_tag_##r(o, w, l)
 extern int parse_tag(struct tag *item);
 extern void release_tag_memory(struct tag *t);
 #define deref_tag(r, o, w, l) deref_tag_##r(o, w, l)