Merge fixes early for next maint series.

diff --git a/pack-check.c b/pack-check.c
index 9c723972b7081df1b893f1c79b075166fa0f0752..eca32b6cabeaf8881abb9c93d9ca89fc556a937c 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -15,10 +15,10 @@ static int verify_packfile(struct packed_git *p)
        /* Header consistency check */
        hdr = p->pack_base;
        if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
-               return error("Packfile signature mismatch", p->pack_name);
-       if (hdr->hdr_version != htonl(PACK_VERSION))
-               return error("Packfile version %d different from ours %d",
-                            ntohl(hdr->hdr_version), PACK_VERSION);
+               return error("Packfile %s signature mismatch", p->pack_name);
+       if (!pack_version_ok(hdr->hdr_version))
+               return error("Packfile version %d unsupported",
+                            ntohl(hdr->hdr_version));
        nr_objects = ntohl(hdr->hdr_entries);
        if (num_packed_objects(p) != nr_objects)
                return error("Packfile claims to have %d objects, "
@@ -58,7 +58,7 @@ static int verify_packfile(struct packed_git *p)
                        continue;
                }
                if (check_sha1_signature(sha1, data, size, type)) {
-                       err = error("cannot packed %s from %s corrupt",
+                       err = error("packed %s from %s is corrupt",
                                    sha1_to_hex(sha1), p->pack_name);
                        free(data);
                        continue;
@@ -72,7 +72,36 @@ static int verify_packfile(struct packed_git *p)
 
 static void show_pack_info(struct packed_git *p)
 {
-       /* Next round */
+       struct pack_header *hdr;
+       int nr_objects, i;
+
+       hdr = p->pack_base;
+       nr_objects = ntohl(hdr->hdr_entries);
+
+       for (i = 0; i < nr_objects; i++) {
+               unsigned char sha1[20], base_sha1[20];
+               struct pack_entry e;
+               char type[20];
+               unsigned long size;
+               unsigned long store_size;
+               unsigned int delta_chain_length;
+
+               if (nth_packed_object_sha1(p, i, sha1))
+                       die("internal error pack-check nth-packed-object");
+               if (!find_pack_entry_one(sha1, &e, p))
+                       die("internal error pack-check find-pack-entry-one");
+
+               packed_object_info_detail(&e, type, &size, &store_size,
+                                         &delta_chain_length,
+                                         base_sha1);
+               printf("%s ", sha1_to_hex(sha1));
+               if (!delta_chain_length)
+                       printf("%-6s %lu %u\n", type, size, e.offset);
+               else
+                       printf("%-6s %lu %u %u %s\n", type, size, e.offset,
+                              delta_chain_length, sha1_to_hex(base_sha1));
+       }
+
 }
 
 int verify_pack(struct packed_git *p, int verbose)
@@ -103,7 +132,9 @@ int verify_pack(struct packed_git *p, int verbose)
                if (ret)
                        printf("%s: bad\n", p->pack_name);
                else {
+                       use_packed_git(p);
                        show_pack_info(p);
+                       unuse_packed_git(p);
                        printf("%s: ok\n", p->pack_name);
                }
        }