diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-06-28 18:22:05 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-29 10:43:39 -0700 |
| commit | a74093da5ed601a09fa158e5ba6f6f14c1142a3e (patch) | |
| tree | 6e9603b7e816566bd5e4ba1478089c992bee196e /builtin | |
| parent | tag: add repository argument to parse_tag_buffer (diff) | |
| download | tgif-a74093da5ed601a09fa158e5ba6f6f14c1142a3e.tar.xz | |
tag: add repository argument to deref_tag
Add a repository argument to allow the callers of deref_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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff.c | 2 | ||||
| -rw-r--r-- | builtin/fmt-merge-msg.c | 3 | ||||
| -rw-r--r-- | builtin/grep.c | 3 | ||||
| -rw-r--r-- | builtin/name-rev.c | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 7971530b9b..361a3c3ed3 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -402,7 +402,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix) int flags = (obj->flags & UNINTERESTING); if (!obj->parsed) obj = parse_object(the_repository, &obj->oid); - obj = deref_tag(obj, NULL, 0); + obj = deref_tag(the_repository, obj, NULL, 0); if (!obj) die(_("invalid object '%s' given."), name); if (obj->type == OBJ_COMMIT) diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 36318ef46e..ff165c0fcd 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -344,7 +344,8 @@ static void shortlog(const char *name, const struct object_id *oid = &origin_data->oid; int limit = opts->shortlog_len; - branch = deref_tag(parse_object(the_repository, oid), oid_to_hex(oid), + branch = deref_tag(the_repository, parse_object(the_repository, oid), + oid_to_hex(oid), GIT_SHA1_HEXSZ); if (!branch || branch->type != OBJ_COMMIT) return; diff --git a/builtin/grep.c b/builtin/grep.c index ee753a403e..538a818e6d 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -647,7 +647,8 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec, for (i = 0; i < nr; i++) { struct object *real_obj; - real_obj = deref_tag(list->objects[i].item, NULL, 0); + real_obj = deref_tag(the_repository, list->objects[i].item, + NULL, 0); /* load the gitmodules file for this rev */ if (recurse_submodules) { diff --git a/builtin/name-rev.c b/builtin/name-rev.c index f6eb419a02..f1cb45c227 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -455,7 +455,8 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix) commit = NULL; object = parse_object(the_repository, &oid); if (object) { - struct object *peeled = deref_tag(object, *argv, 0); + struct object *peeled = deref_tag(the_repository, + object, *argv, 0); if (peeled && peeled->type == OBJ_COMMIT) commit = (struct commit *)peeled; } |