X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=pack-check.c;h=67a7ecdf16a39000ffa9ed3453854607bc1e141d;hb=735d80b3bf1be9513d030e61af1ef6512cec015a;hp=916257f418717157c9044155423ae21e425c733c;hpb=ad8c80a58f7bf8f7d5d34794355e5540cd7b3218;p=git.git diff --git a/pack-check.c b/pack-check.c index 916257f4..67a7ecdf 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;