mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add several uses of get_object_hash.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/merge-tree.c
View File

@ -60,7 +60,7 @@ static void *result(struct merge_list *entry, unsigned long *size)
const char *path = entry->path;
if (!entry->stage)
return read_sha1_file(entry->blob->object.sha1, &type, size);
return read_sha1_file(get_object_hash(entry->blob->object), &type, size);
base = NULL;
if (entry->stage == 1) {
base = entry->blob;
@ -82,7 +82,7 @@ static void *origin(struct merge_list *entry, unsigned long *size)
enum object_type type;
while (entry) {
if (entry->stage == 2)
return read_sha1_file(entry->blob->object.sha1, &type, size);
return read_sha1_file(get_object_hash(entry->blob->object), &type, size);
entry = entry->link;
}
return NULL;