Skip to content

Commit

Permalink
tree: allow lookup_tree to handle arbitrary repositories
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
stefanbeller authored and gitster committed Jun 29, 2018
1 parent 17126cd commit f58a6cb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions tree.c
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions tree.h
Expand Up @@ -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);

Expand Down

0 comments on commit f58a6cb

Please sign in to comment.