summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-06-29 01:22:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-29 17:43:40 (GMT)
commit286d258d4f8b6f67676b1c50c2fd07a577450518 (patch)
tree9021869684426925dce04a4d57efce157e49cce3
parent8e4b0b6047e3cfbe627de6694c2eeae6904b41a1 (diff)
downloadgit-286d258d4f8b6f67676b1c50c2fd07a577450518.zip
git-286d258d4f8b6f67676b1c50c2fd07a577450518.tar.gz
git-286d258d4f8b6f67676b1c50c2fd07a577450518.tar.bz2
tag.c: allow deref_tag to handle arbitrary repositories
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--tag.c5
-rw-r--r--tag.h3
2 files changed, 3 insertions, 5 deletions
diff --git a/tag.c b/tag.c
index 682e779..94a89b2 100644
--- a/tag.c
+++ b/tag.c
@@ -64,12 +64,11 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
return ret;
}
-struct object *deref_tag_the_repository(struct object *o, const char *warn, int warnlen)
+struct object *deref_tag(struct repository *r, struct object *o, const char *warn, int warnlen)
{
while (o && o->type == OBJ_TAG)
if (((struct tag *)o)->tagged)
- o = parse_object(the_repository,
- &((struct tag *)o)->tagged->oid);
+ o = parse_object(r, &((struct tag *)o)->tagged->oid);
else
o = NULL;
if (!o && warn) {
diff --git a/tag.h b/tag.h
index efd4c7d..e669c3e 100644
--- a/tag.h
+++ b/tag.h
@@ -15,8 +15,7 @@ extern struct tag *lookup_tag(struct repository *r, const struct object_id *oid)
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 struct object *deref_tag_the_repository(struct object *, const char *, int);
+extern struct object *deref_tag(struct repository *r, struct object *, const char *, int);
extern struct object *deref_tag_noverify(struct object *);
extern int gpg_verify_tag(const struct object_id *oid,
const char *name_to_report, unsigned flags);