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:
brian m. carlson
2015-11-10 02:22:27 +00:00
committed by Jeff King
parent 3c4270107f
commit 7999b2cf77
61 changed files with 253 additions and 253 deletions

View File

@ -11,7 +11,7 @@ static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
unsigned long size;
enum object_type type;
buf = read_sha1_file(obj->object.sha1, &type, &size);
buf = read_sha1_file(get_object_hash(obj->object), &type, &size);
if (!buf)
return -1;
if (type != OBJ_BLOB) {
@ -100,7 +100,7 @@ void *merge_blobs(const char *path, struct blob *base, struct blob *our, struct
return NULL;
if (!our)
our = their;
return read_sha1_file(our->object.sha1, &type, size);
return read_sha1_file(get_object_hash(our->object), &type, size);
}
if (fill_mmfile_blob(&f1, our) < 0)