reftable: handle null refnames in reftable_ref_record_equal

[thirdparty/git.git] / object.c

diff --git a/object.c b/object.c
index 4e85955a941168bc4bcd0f97ee98353402561dd1..23a24e678a8e33f82b417fa6f005aae7de7bc29f 100644 (file)
--- a/object.c
+++ b/object.c
@@ -279,7 +279,7 @@ struct object *parse_object(struct repository *r, const struct object_id *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(r, repl, NULL, 0, NULL) < 0) {
+               if (check_object_signature(r, repl, NULL, 0, NULL, NULL) < 0) {
                        error(_("hash mismatch %s"), oid_to_hex(oid));
                        return NULL;
                }
@@ -290,7 +290,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid)
        buffer = repo_read_object_file(r, oid, &type, &size);
        if (buffer) {
                if (check_object_signature(r, repl, buffer, size,
-                                          type_name(type)) < 0) {
+                                          type_name(type), NULL) < 0) {
                        free(buffer);
                        error(_("hash mismatch %s"), oid_to_hex(repl));
                        return NULL;