object: parse_object to honor its repository argument
In 8e4b0b6047 (object.c: allow parse_object to handle arbitrary repositories, 2018-06-28), we forgot to pass the repository down to the read_object_file. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Nov 13, 2018 at 16:12 UTC
d1a69022650bbb6a56ebe93a28fe8b0e6a8d7fa7
1 file changed
+3
-3
object.c
+3
-3
@@ -259,8 +259,8 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
259
if (obj && obj->parsed)
260
return obj;
261
262
- if ((obj && obj->type == OBJ_BLOB && has_object_file(oid)) ||
263
- (!obj && has_object_file(oid) &&
262
+ if ((obj && obj->type == OBJ_BLOB && repo_has_object_file(r, oid)) ||
263
+ (!obj && repo_has_object_file(r, oid) &&
264
oid_object_info(r, oid, NULL) == OBJ_BLOB)) {
265
if (check_object_signature(repl, NULL, 0, NULL) < 0) {
266
error(_("sha1 mismatch %s"), oid_to_hex(oid));
@@ -270,7 +270,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
270
return lookup_object(r, oid->hash);
271
}
272
273
- buffer = read_object_file(oid, &type, &size);
273
+ buffer = repo_read_object_file(r, oid, &type, &size);
274
if (buffer) {
275
if (check_object_signature(repl, buffer, size, type_name(type)) < 0) {
276
free(buffer);