diff options
Diffstat (limited to 'merge-blobs.c')
| -rw-r--r-- | merge-blobs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/merge-blobs.c b/merge-blobs.c index 9b6eac22e4..fabb8c19ce 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -4,6 +4,7 @@ #include "ll-merge.h" #include "blob.h" #include "merge-blobs.h" +#include "object-store.h" static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) { @@ -11,7 +12,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.oid.hash, &type, &size); + buf = read_object_file(&obj->object.oid, &type, &size); if (!buf) return -1; if (type != OBJ_BLOB) { @@ -66,7 +67,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.oid.hash, &type, size); + return read_object_file(&our->object.oid, &type, size); } if (fill_mmfile_blob(&f1, our) < 0) |