From: Nguyễn Thái Ngọc Duy Date: Fri, 22 Feb 2013 12:09:24 +0000 (+0700) Subject: read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr() X-Git-Tag: v1.8.1.6~24^2~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b82a7b5bbc1c86d5f6d4198f694b213360dc2485;p=git-core%2Fgit.git read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr() 9d22778 (read-cache.c: write prefix-compressed names in the index - 2012-04-04) defined these. Interestingly, they were not used by read-cache.c, or anywhere in that patch. They were used in builtin/update-index.c later for checking supported index versions. Use them here too. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/read-cache.c b/read-cache.c index fda78bc35..5cddbc325 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1256,7 +1256,7 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size) if (hdr->hdr_signature != htonl(CACHE_SIGNATURE)) return error("bad signature"); hdr_version = ntohl(hdr->hdr_version); - if (hdr_version < 2 || 4 < hdr_version) + if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version) return error("bad index version %d", hdr_version); git_SHA1_Init(&c); git_SHA1_Update(&c, hdr, size - 20);