undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tag: add repository argument to lookup_tag

Browse Source 
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.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2018-06-28 18:22:03 -07:00 committed by Junio C Hamano
parent 3ce85f7e5a
commit ce71efb713
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/describe.c
View File

@ -93,13 +93,13 @@ static int replace_name(struct commit_name *e,
struct tag *t; struct tag *t;
if (!e->tag) { if (!e->tag) {
t = lookup_tag(&e->oid); t = lookup_tag(the_repository, &e->oid);
if (!t || parse_tag(t)) if (!t || parse_tag(t))
return 1; return 1;
e->tag = t; e->tag = t;
} }
t = lookup_tag(oid); t = lookup_tag(the_repository, oid);
if (!t || parse_tag(t)) if (!t || parse_tag(t))
return 0; return 0;
*tag = t; *tag = t;
@ -267,7 +267,7 @@ static unsigned long finish_depth_computation(
static void append_name(struct commit_name *n, struct strbuf *dst) 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(&n->oid); n->tag = lookup_tag(the_repository, &n->oid);
if (!n->tag || parse_tag(n->tag)) if (!n->tag || parse_tag(n->tag))
die(_("annotated tag %s not available"), n->path); die(_("annotated tag %s not available"), n->path);
} }

2
builtin/pack-objects.c
View File

@ -2474,7 +2474,7 @@ static void add_tag_chain(const struct object_id *oid)
if (packlist_find(&to_pack, oid->hash, NULL)) if (packlist_find(&to_pack, oid->hash, NULL))
return; return;
tag = lookup_tag(oid); tag = lookup_tag(the_repository, oid);
while (1) { while (1) {
if (!tag || parse_tag(tag) || !tag->tagged) if (!tag || parse_tag(tag) || !tag->tagged)
die("unable to pack objects reachable from tag %s", die("unable to pack objects reachable from tag %s",

2
builtin/replace.c
View File

@ -402,7 +402,7 @@ static int check_one_mergetag(struct commit *commit,
int i; int i;
hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid); hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid);
tag = lookup_tag(&tag_oid); tag = lookup_tag(the_repository, &tag_oid);
if (!tag) if (!tag)
return error(_("bad mergetag in commit '%s'"), ref); return error(_("bad mergetag in commit '%s'"), ref);
if (parse_tag_buffer(tag, extra->value, extra->len)) if (parse_tag_buffer(tag, extra->value, extra->len))

2
log-tree.c
View File

@ -498,7 +498,7 @@ static int show_one_mergetag(struct commit *commit,
size_t payload_size, gpg_message_offset; size_t payload_size, gpg_message_offset;
hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid); hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid);
tag = lookup_tag(&oid); tag = lookup_tag(the_repository, &oid);
if (!tag) if (!tag)
return -1; /* error message already given */ return -1; /* error message already given */

2
object.c
View File

@ -223,7 +223,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e
obj = &commit->object; obj = &commit->object;
} }
} else if (type == OBJ_TAG) { } else if (type == OBJ_TAG) {
struct tag *tag = lookup_tag(oid); struct tag *tag = lookup_tag(the_repository, oid);
if (tag) { if (tag) {
if (parse_tag_buffer(tag, buffer, size)) if (parse_tag_buffer(tag, buffer, size))
return NULL; return NULL;

2
sha1-name.c
View File

@ -358,7 +358,7 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
format_commit_message(commit, " %ad - %s", &desc, &pp); format_commit_message(commit, " %ad - %s", &desc, &pp);
} }
} else if (type == OBJ_TAG) { } 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) if (!parse_tag(tag) && tag->tag)
strbuf_addf(&desc, " %s", tag->tag); strbuf_addf(&desc, " %s", tag->tag);
} }

4
tag.c
View File

@ -92,7 +92,7 @@ struct object *deref_tag_noverify(struct object *o)
return 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); struct object *obj = lookup_object(the_repository, oid->hash);
if (!obj) if (!obj)
@ -160,7 +160,7 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
} 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(the_repository, &oid);
} else if (!strcmp(type, tag_type)) { } else if (!strcmp(type, tag_type)) {
item->tagged = (struct object *)lookup_tag(&oid); item->tagged = (struct object *)lookup_tag(the_repository, &oid);
} else { } else {
error("Unknown type %s", type); error("Unknown type %s", type);
item->tagged = NULL; item->tagged = NULL;

4
tag.h
View File

@ -11,8 +11,8 @@ struct tag {
char *tag; char *tag;
timestamp_t date; timestamp_t date;
}; };
#define lookup_tag(r, o) lookup_tag_##r(o)
extern struct tag *lookup_tag(const struct object_id *oid); 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_buffer(struct tag *item, const void *data, unsigned long size);
extern int parse_tag(struct tag *item); extern int parse_tag(struct tag *item);
extern void release_tag_memory(struct tag *t); extern void release_tag_memory(struct tag *t);