[PATCH 5/9] read-cache.c: report the header version we do not understand
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 3, 2012, 22:53 UTC
- Message-ID
- <1333493596-14202-6-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1333493596-14202-1-git-send-email-gitster@pobox.com>
Instead of just saying "bad index version", report the value we read from the disk.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- read-cache.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/read-cache.c b/read-cache.c index 58bfb24..2d93826 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1247,11 +1247,13 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size) { git_SHA_CTX c; unsigned char sha1[20]; + int hdr_version; if (hdr->hdr_signature != htonl(CACHE_SIGNATURE)) return error("bad signature"); - if (hdr->hdr_version != htonl(2) && hdr->hdr_version != htonl(3)) - return error("bad index version"); + hdr_version = ntohl(hdr->hdr_version); + if (hdr_version < 2 || 3 < hdr_version) + return error("bad index version %d", hdr_version); git_SHA1_Init(&c); git_SHA1_Update(&c, hdr, size - 20); git_SHA1_Final(sha1, &c);
-- 1.7.10.rc4.54.g1d5dd3