diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:46:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:46:42 -0700 |
| commit | f7b1ad870c46c53685ef83efbfd7d9ca1983a191 (patch) | |
| tree | 3d37b13993699ccd8f1bebc1b4b93546da3e9bda /read-cache.c | |
| parent | 04fe1184fd0611bf26785b365dd344b8f7d72861 (diff) | |
| parent | 7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4 (diff) | |
| download | git-f7b1ad870c46c53685ef83efbfd7d9ca1983a191.tar.gz | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
bundle: Add colons to list headings in "verify"
bundle: Fix "verify" output if history is complete
Documentation: filter-branch env-filter example
git-filter-branch.txt: clarify ident variables usage
git-compat-util.h: Provide missing netdb.h definitions
describe: Document --match pattern format
Documentation/githooks: Explain pre-rebase parameters
update-index: list supported idx versions and their features
diff-options: unconfuse description of --color
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 827ae55c50..670a06bc79 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1260,7 +1260,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); |