Convert struct object to object_id
struct object is one of the major data structures dealing with object IDs. Convert it to use struct object_id instead of an unsigned char array. Convert get_object_hash to refer to the new member as well. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
committed by
Jeff King
parent
7999b2cf77
commit
f2fd0760f6
6
tree.c
6
tree.c
@ -216,11 +216,11 @@ int parse_tree_gently(struct tree *item, int quiet_on_missing)
|
||||
if (!buffer)
|
||||
return quiet_on_missing ? -1 :
|
||||
error("Could not read %s",
|
||||
sha1_to_hex(item->object.sha1));
|
||||
oid_to_hex(&item->object.oid));
|
||||
if (type != OBJ_TREE) {
|
||||
free(buffer);
|
||||
return error("Object %s not a tree",
|
||||
sha1_to_hex(item->object.sha1));
|
||||
oid_to_hex(&item->object.oid));
|
||||
}
|
||||
return parse_tree_buffer(item, buffer, size);
|
||||
}
|
||||
@ -248,6 +248,6 @@ struct tree *parse_tree_indirect(const unsigned char *sha1)
|
||||
else
|
||||
return NULL;
|
||||
if (!obj->parsed)
|
||||
parse_object(obj->sha1);
|
||||
parse_object(obj->oid.hash);
|
||||
} while (1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user