diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:45:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:45:26 -0700 |
| commit | a7b6ad5e90be82f4089be39a78850d5f88e4d552 (patch) | |
| tree | 978b2711a5d2b656a7abdd17288fa2f1c2d8a74d /read-cache.c | |
| parent | 8ddd9c18f323234e73e5f4c5d2675e355c68db7e (diff) | |
| parent | 647d87947f8248df5608f621ece8b1dc875fa859 (diff) | |
| download | git-a7b6ad5e90be82f4089be39a78850d5f88e4d552.tar.gz git-a7b6ad5e90be82f4089be39a78850d5f88e4d552.tar.xz | |
Merge branch 'nd/doc-index-format' into maint-1.8.1
The v4 index format was not documented.
* nd/doc-index-format:
update-index: list supported idx versions and their features
read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
index-format.txt: mention of v4 is missing in some places
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |