diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-03 15:53:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-03 16:24:45 -0700 |
| commit | 0136bac9b8a449cdf2179ad0242e079262b0aeea (patch) | |
| tree | 62637aa5f32b62e3248e3bb5786fb27ac198aea6 /read-cache.c | |
| parent | read-cache.c: make create_from_disk() report number of bytes it consumed (diff) | |
| download | tgif-0136bac9b8a449cdf2179ad0242e079262b0aeea.tar.xz | |
read-cache.c: report the header version we do not understand
Instead of just saying "bad index version", report the value we read
from the disk.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/read-cache.c b/read-cache.c index 58bfb2481d..2d938263ad 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); |