X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=pack-check.c;h=eca32b6cabeaf8881abb9c93d9ca89fc556a937c;hb=01df529722618a78d2acf6159c7b1e65f565cabc;hp=054b0131e9756f8bb98556a62179c2f1c232e2e5;hpb=07ee0d77c66d6f356cd3f82435e67510779aa53c;p=git.git

diff --git a/pack-check.c b/pack-check.c
index 054b0131..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, "
@@ -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));
 	}