tag: support arbitrary repositories in parse_tag()

Allow callers of parse_tag() pass in the repository to use.  Let most of
them pass in the_repository to get the same result as before.  One of
them has stopped using the_repository in ef9b0370da (sha1-name.c: store
and use repo in struct disambiguate_state, 2019-04-16); let it pass in
its stored repository.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2025-12-28 19:10:50 +01:00 committed by Junio C Hamano
parent 154717b3b0
commit b6e4cc8c32
8 changed files with 13 additions and 13 deletions

View File

@ -112,13 +112,13 @@ static int replace_name(struct commit_name *e,
if (!e->tag) { if (!e->tag) {
t = lookup_tag(the_repository, &e->oid); t = lookup_tag(the_repository, &e->oid);
if (!t || parse_tag(t)) if (!t || parse_tag(the_repository, t))
return 1; return 1;
e->tag = t; e->tag = t;
} }
t = lookup_tag(the_repository, oid); t = lookup_tag(the_repository, oid);
if (!t || parse_tag(t)) if (!t || parse_tag(the_repository, t))
return 0; return 0;
*tag = t; *tag = t;
@ -335,7 +335,7 @@ static void append_name(struct commit_name *n, struct strbuf *dst)
{ {
if (n->prio == 2 && !n->tag) { if (n->prio == 2 && !n->tag) {
n->tag = lookup_tag(the_repository, &n->oid); n->tag = lookup_tag(the_repository, &n->oid);
if (!n->tag || parse_tag(n->tag)) if (!n->tag || parse_tag(the_repository, n->tag))
die(_("annotated tag %s not available"), n->path); die(_("annotated tag %s not available"), n->path);
} }
if (n->tag && !n->name_checked) { if (n->tag && !n->name_checked) {

View File

@ -3293,7 +3293,7 @@ static void add_tag_chain(const struct object_id *oid)
tag = lookup_tag(the_repository, oid); tag = lookup_tag(the_repository, oid);
while (1) { while (1) {
if (!tag || parse_tag(tag) || !tag->tagged) if (!tag || parse_tag(the_repository, tag) || !tag->tagged)
die(_("unable to pack objects reachable from tag %s"), die(_("unable to pack objects reachable from tag %s"),
oid_to_hex(oid)); oid_to_hex(oid));

2
fsck.c
View File

@ -474,7 +474,7 @@ static int fsck_walk_tag(struct tag *tag, void *data, struct fsck_options *optio
{ {
const char *name = fsck_get_object_name(options, &tag->object.oid); const char *name = fsck_get_object_name(options, &tag->object.oid);
if (parse_tag(tag)) if (parse_tag(the_repository, tag))
return -1; return -1;
if (name) if (name)
fsck_put_object_name(options, &tag->tagged->oid, "%s", name); fsck_put_object_name(options, &tag->tagged->oid, "%s", name);

View File

@ -449,7 +449,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
} else if (type == OBJ_TAG) { } else if (type == OBJ_TAG) {
struct tag *tag = lookup_tag(ds->repo, oid); struct tag *tag = lookup_tag(ds->repo, oid);
if (!parse_tag(tag) && tag->tag) { if (!parse_tag(ds->repo, tag) && tag->tag) {
/* /*
* TRANSLATORS: This is a line of ambiguous * TRANSLATORS: This is a line of ambiguous
* tag object output. E.g.: * tag object output. E.g.:

View File

@ -2866,7 +2866,7 @@ static int match_points_at(struct oid_array *points_at,
while (obj && obj->type == OBJ_TAG) { while (obj && obj->type == OBJ_TAG) {
struct tag *tag = (struct tag *)obj; struct tag *tag = (struct tag *)obj;
if (parse_tag(tag) < 0) { if (parse_tag(the_repository, tag) < 0) {
obj = NULL; obj = NULL;
break; break;
} }

8
tag.c
View File

@ -13,6 +13,7 @@
#include "gpg-interface.h" #include "gpg-interface.h"
#include "hex.h" #include "hex.h"
#include "packfile.h" #include "packfile.h"
#include "repository.h"
const char *tag_type = "tag"; const char *tag_type = "tag";
@ -203,7 +204,7 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u
return 0; return 0;
} }
int parse_tag(struct tag *item) int parse_tag(struct repository *r, struct tag *item)
{ {
enum object_type type; enum object_type type;
void *data; void *data;
@ -212,8 +213,7 @@ int parse_tag(struct tag *item)
if (item->object.parsed) if (item->object.parsed)
return 0; return 0;
data = odb_read_object(the_repository->objects, &item->object.oid, data = odb_read_object(r->objects, &item->object.oid, &type, &size);
&type, &size);
if (!data) if (!data)
return error("Could not read %s", return error("Could not read %s",
oid_to_hex(&item->object.oid)); oid_to_hex(&item->object.oid));
@ -222,7 +222,7 @@ int parse_tag(struct tag *item)
return error("Object %s not a tag", return error("Object %s not a tag",
oid_to_hex(&item->object.oid)); oid_to_hex(&item->object.oid));
} }
ret = parse_tag_buffer(the_repository, item, data, size); ret = parse_tag_buffer(r, item, data, size);
free(data); free(data);
return ret; return ret;
} }

2
tag.h
View File

@ -13,7 +13,7 @@ struct tag {
}; };
struct tag *lookup_tag(struct repository *r, const struct object_id *oid); 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_buffer(struct repository *r, struct tag *item, const void *data, unsigned long size);
int parse_tag(struct tag *item); int parse_tag(struct repository *r, struct tag *item);
void release_tag_memory(struct tag *t); void release_tag_memory(struct tag *t);
struct object *deref_tag(struct repository *r, struct object *, const char *, int); struct object *deref_tag(struct repository *r, struct object *, const char *, int);
int gpg_verify_tag(struct repository *r, const struct object_id *oid, int gpg_verify_tag(struct repository *r, const struct object_id *oid,

View File

@ -115,7 +115,7 @@ static int process_commit(struct walker *walker, struct commit *commit)
static int process_tag(struct walker *walker, struct tag *tag) static int process_tag(struct walker *walker, struct tag *tag)
{ {
if (parse_tag(tag)) if (parse_tag(the_repository, tag))
return -1; return -1;
return process(walker, tag->tagged); return process(walker, tag->tagged);
} }