Add several uses of get_object_hash.
Convert most instances where the sha1 member of struct object is dereferenced to use get_object_hash. Most instances that are passed to functions that have versions taking struct object_id, such as get_sha1_hex/get_oid_hex, or instances that can be trivially converted to use struct object_id instead, are not converted. 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
3c4270107f
commit
7999b2cf77
@ -707,7 +707,7 @@ static int merge_commit(struct notes_merge_options *o)
|
||||
die("Could not parse commit from NOTES_MERGE_PARTIAL.");
|
||||
|
||||
if (partial->parents)
|
||||
hashcpy(parent_sha1, partial->parents->item->object.sha1);
|
||||
hashcpy(parent_sha1, get_object_hash(partial->parents->item->object));
|
||||
else
|
||||
hashclr(parent_sha1);
|
||||
|
||||
|
Reference in New Issue
Block a user