summaryrefslogtreecommitdiff
path: root/tree.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-06-29 01:21:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-29 17:43:38 (GMT)
commitf86bcc7b2ce6cad68ba1a48a528e380c6126705e (patch)
tree72899ee32edb0e528b03ab6e1123a13c48abbb96 /tree.c
parentda14a7ff99e1d011192a1fe330dd3fddf8977dc3 (diff)
downloadgit-f86bcc7b2ce6cad68ba1a48a528e380c6126705e.zip
git-f86bcc7b2ce6cad68ba1a48a528e380c6126705e.tar.gz
git-f86bcc7b2ce6cad68ba1a48a528e380c6126705e.tar.bz2
tree: add repository argument to lookup_tree
Add a repository argument to allow the callers of lookup_tree 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 'tree.c')
-rw-r--r--tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tree.c b/tree.c
index f31afb8..12b6960 100644
--- a/tree.c
+++ b/tree.c
@@ -120,7 +120,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
len = tree_entry_len(&entry);
strbuf_add(base, entry.path, len);
strbuf_addch(base, '/');
- retval = read_tree_1(lookup_tree(&oid),
+ retval = read_tree_1(lookup_tree(the_repository, &oid),
base, stage, pathspec,
fn, context);
strbuf_setlen(base, oldlen);
@@ -195,7 +195,7 @@ int read_tree(struct tree *tree, int stage, struct pathspec *match,
return 0;
}
-struct tree *lookup_tree(const struct object_id *oid)
+struct tree *lookup_tree_the_repository(const struct object_id *oid)
{
struct object *obj = lookup_object(the_repository, oid->hash);
if (!obj)