Add a repository argument to allow the callers of lookup_tag to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet.
As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Add the cocci patch that converted the callers. Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Stefan Beller <[email protected]> --- builtin/describe.c | 6 +++--- builtin/pack-objects.c | 2 +- builtin/replace.c | 2 +- contrib/coccinelle/object_parser.cocci | 7 +++++++ log-tree.c | 2 +- object.c | 2 +- sha1_name.c | 2 +- tag.c | 4 ++-- tag.h | 4 ++-- 9 files changed, 19 insertions(+), 12 deletions(-) diff --git a/builtin/describe.c b/builtin/describe.c index 2add1e8d83..2589872322 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -88,13 +88,13 @@ static int replace_name(struct commit_name *e, struct tag *t; if (!e->tag) { - t = lookup_tag(&e->oid); + t = lookup_tag(the_repository, &e->oid); if (!t || parse_tag(t)) return 1; e->tag = t; } - t = lookup_tag(oid); + t = lookup_tag(the_repository, oid); if (!t || parse_tag(t)) return 0; *tag = t; @@ -262,7 +262,7 @@ static unsigned long finish_depth_computation( static void append_name(struct commit_name *n, struct strbuf *dst) { if (n->prio == 2 && !n->tag) { - n->tag = lookup_tag(&n->oid); + n->tag = lookup_tag(the_repository, &n->oid); if (!n->tag || parse_tag(n->tag)) die(_("annotated tag %s not available"), n->path); } diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 4e59e496dc..6348a5e721 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2371,7 +2371,7 @@ static void add_tag_chain(const struct object_id *oid) if (packlist_find(&to_pack, oid->hash, NULL)) return; - tag = lookup_tag(oid); + tag = lookup_tag(the_repository, oid); while (1) { if (!tag || parse_tag(tag) || !tag->tagged) die("unable to pack objects reachable from tag %s", diff --git a/builtin/replace.c b/builtin/replace.c index 25322d2f73..b79dd15fdb 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -360,7 +360,7 @@ static void check_one_mergetag(struct commit *commit, int i; hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), tag_oid.hash); - tag = lookup_tag(&tag_oid); + tag = lookup_tag(the_repository, &tag_oid); if (!tag) die(_("bad mergetag in commit '%s'"), ref); if (parse_tag_buffer(tag, extra->value, extra->len)) diff --git a/contrib/coccinelle/object_parser.cocci b/contrib/coccinelle/object_parser.cocci index e5ce73fe13..8b9b1c717a 100644 --- a/contrib/coccinelle/object_parser.cocci +++ b/contrib/coccinelle/object_parser.cocci @@ -13,6 +13,13 @@ expression E; E) +@@ +expression E; +@@ + lookup_tag( ++the_repository, + E) + @@ expression E; @@ diff --git a/log-tree.c b/log-tree.c index 57d5e5f56d..ff64a61e57 100644 --- a/log-tree.c +++ b/log-tree.c @@ -502,7 +502,7 @@ static void show_one_mergetag(struct commit *commit, size_t payload_size, gpg_message_offset; hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), oid.hash); - tag = lookup_tag(&oid); + tag = lookup_tag(the_repository, &oid); if (!tag) return; /* error message already given */ diff --git a/object.c b/object.c index 5ddbe91a38..5ebbb32a92 100644 --- a/object.c +++ b/object.c @@ -220,7 +220,7 @@ struct object *parse_object_buffer(const struct object_id *oid, enum object_type obj = &commit->object; } } else if (type == OBJ_TAG) { - struct tag *tag = lookup_tag(oid); + struct tag *tag = lookup_tag(the_repository, oid); if (tag) { if (parse_tag_buffer(tag, buffer, size)) return NULL; diff --git a/sha1_name.c b/sha1_name.c index 0139b480a3..717b31359a 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -379,7 +379,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data) format_commit_message(commit, " %ad - %s", &desc, &pp); } } else if (type == OBJ_TAG) { - struct tag *tag = lookup_tag(oid); + struct tag *tag = lookup_tag(the_repository, oid); if (!parse_tag(tag) && tag->tag) strbuf_addf(&desc, " %s", tag->tag); } diff --git a/tag.c b/tag.c index ba1df1c695..8935f3c8c9 100644 --- a/tag.c +++ b/tag.c @@ -92,7 +92,7 @@ struct object *deref_tag_noverify(struct object *o) return o; } -struct tag *lookup_tag(const struct object_id *oid) +struct tag *lookup_tag_the_repository(const struct object_id *oid) { struct object *obj = lookup_object(the_repository, oid->hash); if (!obj) @@ -152,7 +152,7 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size) } else if (!strcmp(type, commit_type)) { item->tagged = (struct object *)lookup_commit(&oid); } else if (!strcmp(type, tag_type)) { - item->tagged = (struct object *)lookup_tag(&oid); + item->tagged = (struct object *)lookup_tag(the_repository, &oid); } else { error("Unknown type %s", type); item->tagged = NULL; diff --git a/tag.h b/tag.h index d469534e82..97d58ebf7b 100644 --- a/tag.h +++ b/tag.h @@ -11,8 +11,8 @@ struct tag { char *tag; timestamp_t date; }; - -extern struct tag *lookup_tag(const struct object_id *oid); +#define lookup_tag(r, o) lookup_tag_##r(o) +extern struct tag *lookup_tag_the_repository(const struct object_id *oid); extern int parse_tag_buffer(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); -- 2.15.1.433.g936d1b9894.dirty
