X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=pack-check.c;h=eca32b6cabeaf8881abb9c93d9ca89fc556a937c;hb=197e8951abd2ebf2c70d0847bb0b38b16b92175b;hp=916257f418717157c9044155423ae21e425c733c;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git

diff --git a/pack-check.c b/pack-check.c
index 916257f4..eca32b6c 100644
--- 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;
@@ -84,7 +84,7 @@ static void show_pack_info(struct packed_git *p)
 		char type[20];
 		unsigned long size;
 		unsigned long store_size;
-		int delta_chain_length;
+		unsigned int delta_chain_length;
 
 		if (nth_packed_object_sha1(p, i, sha1))
 			die("internal error pack-check nth-packed-object");
@@ -98,7 +98,7 @@ static void show_pack_info(struct packed_git *p)
 		if (!delta_chain_length)
 			printf("%-6s %lu %u\n", type, size, e.offset);
 		else
-			printf("%-6s %lu %u %d %s\n", type, size, e.offset,
+			printf("%-6s %lu %u %u %s\n", type, size, e.offset,
 			       delta_chain_length, sha1_to_hex(base_sha1));
 	}