diff options
| author | Stefan Beller <sbeller@google.com> | 2018-06-29 01:22:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 17:43:39 (GMT) |
| commit | a74093da5ed601a09fa158e5ba6f6f14c1142a3e (patch) | |
| tree | 6e9603b7e816566bd5e4ba1478089c992bee196e /merge-recursive.c | |
| parent | 0e740fed5dfd84bf0d136719d91a7764a3477d20 (diff) | |
| download | git-a74093da5ed601a09fa158e5ba6f6f14c1142a3e.zip git-a74093da5ed601a09fa158e5ba6f6f14c1142a3e.tar.gz git-a74093da5ed601a09fa158e5ba6f6f14c1142a3e.tar.bz2 | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 41366e7..1dd6ec3 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3467,7 +3467,8 @@ static struct commit *get_ref(const struct object_id *oid, const char *name) { struct object *object; - object = deref_tag(parse_object(the_repository, oid), name, + object = deref_tag(the_repository, parse_object(the_repository, oid), + name, strlen(name)); if (!object) return NULL; |