Merge branch 'jc/merge-x-theirs-docfix' into maint

diff --git a/pack-check.c b/pack-check.c
index c5c7763323156232748314723e39deb92b93fa4e..e1fcb228fa126e34528e9d5a38b81a6b2eae2f2a 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -5,7 +5,10 @@
 
 struct idx_entry {
        off_t                offset;
-       const unsigned char *sha1;
+       union idx_entry_object {
+               const unsigned char *hash;
+               struct object_id *oid;
+       } oid;
        unsigned int nr;
 };
 
@@ -51,7 +54,7 @@ static int verify_packfile(struct packed_git *p,
        off_t index_size = p->index_size;
        const unsigned char *index_base = p->index_data;
        git_SHA_CTX ctx;
-       unsigned char sha1[20], *pack_sig;
+       unsigned char hash[GIT_MAX_RAWSZ], *pack_sig;
        off_t offset = 0, pack_sig_ofs = 0;
        uint32_t nr_objects, i;
        int err = 0;
@@ -71,9 +74,9 @@ static int verify_packfile(struct packed_git *p,
                        remaining -= (unsigned int)(offset - pack_sig_ofs);
                git_SHA1_Update(&ctx, in, remaining);
        } while (offset < pack_sig_ofs);
-       git_SHA1_Final(sha1, &ctx);
+       git_SHA1_Final(hash, &ctx);
        pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL);
-       if (hashcmp(sha1, pack_sig))
+       if (hashcmp(hash, pack_sig))
                err = error("%s SHA1 checksum mismatch",
                            p->pack_name);
        if (hashcmp(index_base + index_size - 40, pack_sig))
@@ -90,13 +93,13 @@ static int verify_packfile(struct packed_git *p,
        entries[nr_objects].offset = pack_sig_ofs;
        /* first sort entries by pack offset, since unpacking them is more efficient that way */
        for (i = 0; i < nr_objects; i++) {
-               entries[i].sha1 = nth_packed_object_sha1(p, i);
-               if (!entries[i].sha1)
+               entries[i].oid.hash = nth_packed_object_sha1(p, i);
+               if (!entries[i].oid.hash)
                        die("internal error pack-check nth-packed-object");
                entries[i].offset = nth_packed_object_offset(p, i);
                entries[i].nr = i;
        }
-       qsort(entries, nr_objects, sizeof(*entries), compare_entries);
+       QSORT(entries, nr_objects, compare_entries);
 
        for (i = 0; i < nr_objects; i++) {
                void *data;
@@ -112,7 +115,7 @@ static int verify_packfile(struct packed_git *p,
                        if (check_pack_crc(p, w_curs, offset, len, nr))
                                err = error("index CRC mismatch for object %s "
                                            "from %s at offset %"PRIuMAX"",
-                                           sha1_to_hex(entries[i].sha1),
+                                           oid_to_hex(entries[i].oid.oid),
                                            p->pack_name, (uintmax_t)offset);
                }
 
@@ -135,14 +138,14 @@ static int verify_packfile(struct packed_git *p,
 
                if (data_valid && !data)
                        err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
-                                   sha1_to_hex(entries[i].sha1), p->pack_name,
+                                   oid_to_hex(entries[i].oid.oid), p->pack_name,
                                    (uintmax_t)entries[i].offset);
-               else if (check_sha1_signature(entries[i].sha1, data, size, typename(type)))
+               else if (check_sha1_signature(entries[i].oid.hash, data, size, typename(type)))
                        err = error("packed %s from %s is corrupt",
-                                   sha1_to_hex(entries[i].sha1), p->pack_name);
+                                   oid_to_hex(entries[i].oid.oid), p->pack_name);
                else if (fn) {
                        int eaten = 0;
-                       err |= fn(entries[i].sha1, type, size, data, &eaten);
+                       err |= fn(entries[i].oid.oid, type, size, data, &eaten);
                        if (eaten)
                                data = NULL;
                }