packfile: allow has_packed_and_bad to handle arbitrary repositories

has_packed_and_bad is not widely used, so just migrate it all at once.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/packfile.c b/packfile.c
index 841b36182fcd938da5ee0a4b065e0717ef4a18ed..bc2e0f5043bed2e230b21179b4034fdde58e7f68 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1131,12 +1131,13 @@ void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1)
        p->num_bad_objects++;
 }
 
        p->num_bad_objects++;
 }
 

-const struct packed_git *has_packed_and_bad(const unsigned char *sha1)
+const struct packed_git *has_packed_and_bad(struct repository *r,
+                                           const unsigned char *sha1)

 {
        struct packed_git *p;
        unsigned i;
 
 {
        struct packed_git *p;
        unsigned i;
 

-       for (p = the_repository->objects->packed_git; p; p = p->next)
+       for (p = r->objects->packed_git; p; p = p->next)

                for (i = 0; i < p->num_bad_objects; i++)
                        if (hasheq(sha1,
                                   p->bad_object_sha1 + the_hash_algo->rawsz * i))
                for (i = 0; i < p->num_bad_objects; i++)
                        if (hasheq(sha1,
                                   p->bad_object_sha1 + the_hash_algo->rawsz * i))

diff --git a/packfile.h b/packfile.h
index 442625723dea4b0c8f22b57d52e760d4b810540e..7a62d722317734794d30e09191b1d09e25b0969b 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -146,7 +146,7 @@ extern int packed_object_info(struct repository *r,
                              off_t offset, struct object_info *);
 
 extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
                              off_t offset, struct object_info *);
 
 extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);

-extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);
+extern const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);

 
 /*
  * Iff a pack file in the given repository contains the object named by sha1,
 
 /*
  * Iff a pack file in the given repository contains the object named by sha1,

diff --git a/sha1-file.c b/sha1-file.c
index b8ce21cbafd7a2175b24b9cd579decf8b9ad92bc..856e000ee1afda078d5babb5609b5ad2ae21f0e9 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -1432,7 +1432,7 @@ void *read_object_file_extended(const struct object_id *oid,
                die(_("loose object %s (stored in %s) is corrupt"),
                    oid_to_hex(repl), path);
 
                die(_("loose object %s (stored in %s) is corrupt"),
                    oid_to_hex(repl), path);
 

-       if ((p = has_packed_and_bad(repl->hash)) != NULL)
+       if ((p = has_packed_and_bad(the_repository, repl->hash)) != NULL)

                die(_("packed object %s (stored in %s) is corrupt"),
                    oid_to_hex(repl), p->pack_name);
 
                die(_("packed object %s (stored in %s) is corrupt"),
                    oid_to_hex(repl), p->pack_name);