зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
9b45f49981
Коммит
d1a6902265
6
object.c
6
object.c
|
@ -259,8 +259,8 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
|
|||
if (obj && obj->parsed)
|
||||
return obj;
|
||||
|
||||
if ((obj && obj->type == OBJ_BLOB && has_object_file(oid)) ||
|
||||
(!obj && has_object_file(oid) &&
|
||||
if ((obj && obj->type == OBJ_BLOB && repo_has_object_file(r, oid)) ||
|
||||
(!obj && repo_has_object_file(r, oid) &&
|
||||
oid_object_info(r, oid, NULL) == OBJ_BLOB)) {
|
||||
if (check_object_signature(repl, NULL, 0, NULL) < 0) {
|
||||
error(_("sha1 mismatch %s"), oid_to_hex(oid));
|
||||
|
@ -270,7 +270,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
|
|||
return lookup_object(r, oid->hash);
|
||||
}
|
||||
|
||||
buffer = read_object_file(oid, &type, &size);
|
||||
buffer = repo_read_object_file(r, oid, &type, &size);
|
||||
if (buffer) {
|
||||
if (check_object_signature(repl, buffer, size, type_name(type)) < 0) {
|
||||
free(buffer);
|
||||
|
|
Загрузка…
Ссылка в новой задаче