summaryrefslogtreecommitdiff
path: root/merge-blobs.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge-blobs.c')
-rw-r--r--merge-blobs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-blobs.c b/merge-blobs.c
index 7abb894c68..ddca601c77 100644
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -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(obj->object.oid.hash, &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(our->object.oid.hash, &type, size);
}
if (fill_mmfile_blob(&f1, our) < 0)