Merge branch 'lt/objalloc'

* 'lt/objalloc':
  Clean up object creation to use more common code
  Use proper object allocators for unknown object nodes too
This commit is contained in:
Junio C Hamano
2007-04-21 17:41:40 -07:00
8 changed files with 43 additions and 59 deletions

8
tree.c
View File

@ -127,12 +127,8 @@ int read_tree(struct tree *tree, int stage, const char **match)
struct tree *lookup_tree(const unsigned char *sha1)
{
struct object *obj = lookup_object(sha1);
if (!obj) {
struct tree *ret = alloc_tree_node();
created_object(sha1, &ret->object);
ret->object.type = OBJ_TREE;
return ret;
}
if (!obj)
return create_object(sha1, OBJ_TREE, alloc_tree_node());
if (!obj->type)
obj->type = OBJ_TREE;
if (obj->type != OBJ_TREE) {