diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-06-25 20:22:38 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-25 20:22:38 (GMT) |
commit | 110240588d5c0ca88d3b55da52068f59d8d6367d (patch) | |
tree | 5a9120c2c70aeb9d2e7ac4347870094870019e49 /tree.c | |
parent | fa82bb70d9ef3acb6a47cddfb38a7b0ca40ac362 (diff) | |
parent | 14ba97f81c7b94e10d591b363688a073023f332d (diff) | |
download | git-110240588d5c0ca88d3b55da52068f59d8d6367d.zip git-110240588d5c0ca88d3b55da52068f59d8d6367d.tar.gz git-110240588d5c0ca88d3b55da52068f59d8d6367d.tar.bz2 |
Merge branch 'sb/object-store-alloc'
The conversion to pass "the_repository" and then "a_repository"
throughout the object access API continues.
* sb/object-store-alloc:
alloc: allow arbitrary repositories for alloc functions
object: allow create_object to handle arbitrary repositories
object: allow grow_object_hash to handle arbitrary repositories
alloc: add repository argument to alloc_commit_index
alloc: add repository argument to alloc_report
alloc: add repository argument to alloc_object_node
alloc: add repository argument to alloc_tag_node
alloc: add repository argument to alloc_commit_node
alloc: add repository argument to alloc_tree_node
alloc: add repository argument to alloc_blob_node
object: add repository argument to grow_object_hash
object: add repository argument to create_object
repository: introduce parsed objects field
Diffstat (limited to 'tree.c')
-rw-r--r-- | tree.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -5,6 +5,7 @@ #include "blob.h" #include "commit.h" #include "tag.h" +#include "alloc.h" #include "tree-walk.h" const char *tree_type = "tree"; @@ -196,7 +197,8 @@ struct tree *lookup_tree(const struct object_id *oid) { struct object *obj = lookup_object(oid->hash); if (!obj) - return create_object(oid->hash, alloc_tree_node()); + return create_object(the_repository, oid->hash, + alloc_tree_node(the_repository)); return object_as_type(obj, OBJ_TREE, 0); } |