[PATCH v3 19/32] tree: allow lookup_tree to handle arbitrary repositories
From: Stefan Beller <hidden>
Date: 2018-06-29 01:23:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Stefan Beller <redacted> --- tree.c | 10 +++++----- tree.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tree.c b/tree.c
index 45e89ff08eb..78d440a9c8f 100644
--- a/tree.c
+++ b/tree.c@@ -195,13 +195,13 @@ int read_tree(struct tree *tree, int stage, struct pathspec *match, return 0; } -struct tree *lookup_tree_the_repository(const struct object_id *oid) +struct tree *lookup_tree(struct repository *r, const struct object_id *oid) { - struct object *obj = lookup_object(the_repository, oid->hash); + struct object *obj = lookup_object(r, oid->hash); if (!obj) - return create_object(the_repository, oid->hash, - alloc_tree_node(the_repository)); - return object_as_type(the_repository, obj, OBJ_TREE, 0); + return create_object(r, oid->hash, + alloc_tree_node(r)); + return object_as_type(r, obj, OBJ_TREE, 0); } int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
diff --git a/tree.h b/tree.h
index 2ea21ed174b..d4807dc8058 100644
--- a/tree.h
+++ b/tree.h@@ -12,8 +12,7 @@ struct tree { unsigned long size; }; -#define lookup_tree(r, oid) lookup_tree_##r(oid) -struct tree *lookup_tree_the_repository(const struct object_id *oid); +struct tree *lookup_tree(struct repository *r, const struct object_id *oid); int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size);
--
2.18.0.399.gad0ab374a1-goog