packfile: add repository argument to cache_or_unpack_entry

diff --git a/pack-check.c b/pack-check.c
index 403a5725675e59b94322ef30e8aae9b04b3ff87a..d3a57df34f2d2bf0ef9935a51f171f24d8ed6a72 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -1,8 +1,10 @@
 #include "cache.h"
+#include "repository.h"
 #include "pack.h"
 #include "pack-revindex.h"
 #include "progress.h"
 #include "packfile.h"
+#include "object-store.h"
 
 struct idx_entry {
        off_t                offset;
@@ -126,14 +128,14 @@ static int verify_packfile(struct packed_git *p,
 
                if (type == OBJ_BLOB && big_file_threshold <= size) {
                        /*
-                        * Let check_sha1_signature() check it with
+                        * Let check_object_signature() check it with
                         * the streaming interface; no point slurping
                         * the data in-core only to discard.
                         */
                        data = NULL;
                        data_valid = 0;
                } else {
-                       data = unpack_entry(p, entries[i].offset, &type, &size);
+                       data = unpack_entry(the_repository, p, entries[i].offset, &type, &size);
                        data_valid = 1;
                }
 
@@ -141,7 +143,7 @@ static int verify_packfile(struct packed_git *p,
                        err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
                                    oid_to_hex(entries[i].oid.oid), p->pack_name,
                                    (uintmax_t)entries[i].offset);
-               else if (check_sha1_signature(entries[i].oid.hash, data, size, typename(type)))
+               else if (check_object_signature(entries[i].oid.oid, data, size, type_name(type)))
                        err = error("packed %s from %s is corrupt",
                                    oid_to_hex(entries[i].oid.oid), p->pack_name);
                else if (fn) {