diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-23 22:07:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-23 22:07:49 -0700 |
| commit | cdfe138b360cd10f74ef9d2d031cb10447cb3338 (patch) | |
| tree | 44a8d80a209a2f490ae0575c634ea50e7a6e3ac7 /read-cache.c | |
| parent | 8868ba19626a72d5883241c36fd5477897ef8dd1 (diff) | |
| parent | a33fc72fe911fdb8e284c94e08e8f1dafe4d3187 (diff) | |
| download | git-cdfe138b360cd10f74ef9d2d031cb10447cb3338.tar.gz git-cdfe138b360cd10f74ef9d2d031cb10447cb3338.tar.xz | |
Merge branch 'jh/verify-index-checksum-only-in-fsck'
The index file has a trailing SHA-1 checksum to detect file
corruption, and historically we checked it every time the index
file is used. Omit the validation during normal use, and instead
verify only in "git fsck".
* jh/verify-index-checksum-only-in-fsck:
read-cache: force_verify_index_checksum
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c index e44775182..008b33584 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1371,6 +1371,9 @@ struct ondisk_cache_entry_extended { ondisk_cache_entry_extended_size(ce_namelen(ce)) : \ ondisk_cache_entry_size(ce_namelen(ce))) +/* Allow fsck to force verification of the index checksum. */ +int verify_index_checksum; + static int verify_hdr(struct cache_header *hdr, unsigned long size) { git_SHA_CTX c; @@ -1382,6 +1385,10 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size) hdr_version = ntohl(hdr->hdr_version); if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version) return error("bad index version %d", hdr_version); + + if (!verify_index_checksum) + return 0; + git_SHA1_Init(&c); git_SHA1_Update(&c, hdr, size - 20); git_SHA1_Final(sha1, &c); |