diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2023-03-28 16:58:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-28 17:36:45 +0300 |
| commit | bc726bd075929aab6b3e09d4dd5c2b0726fd5350 (patch) | |
| tree | 8e4337a056037e0950944c1046c6f90d0d615bbb /merge-blobs.c | |
| parent | 085390328f5fe1dfba67039b1fd6cc51546a4e41 (diff) | |
cocci: apply the "object-store.h" part of "the_repository.pending"
Apply the part of "the_repository.pending.cocci" pertaining to
"object-store.h".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.c')
| -rw-r--r-- | merge-blobs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/merge-blobs.c b/merge-blobs.c index 8138090f81..f13246406c 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -12,7 +12,8 @@ static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) unsigned long size; enum object_type type; - buf = read_object_file(&obj->object.oid, &type, &size); + buf = repo_read_object_file(the_repository, &obj->object.oid, &type, + &size); if (!buf) return -1; if (type != OBJ_BLOB) { @@ -78,7 +79,8 @@ void *merge_blobs(struct index_state *istate, const char *path, return NULL; if (!our) our = their; - return read_object_file(&our->object.oid, &type, size); + return repo_read_object_file(the_repository, &our->object.oid, + &type, size); } if (fill_mmfile_blob(&f1, our) < 0) |