summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-24 05:07:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-24 05:07:49 (GMT)
commitcdfe138b360cd10f74ef9d2d031cb10447cb3338 (patch)
tree44a8d80a209a2f490ae0575c634ea50e7a6e3ac7 /builtin
parent8868ba19626a72d5883241c36fd5477897ef8dd1 (diff)
parenta33fc72fe911fdb8e284c94e08e8f1dafe4d3187 (diff)
downloadgit-cdfe138b360cd10f74ef9d2d031cb10447cb3338.zip
git-cdfe138b360cd10f74ef9d2d031cb10447cb3338.tar.gz
git-cdfe138b360cd10f74ef9d2d031cb10447cb3338.tar.bz2
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 'builtin')
-rw-r--r--builtin/fsck.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c
index f76e416..b5e13a4 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -771,6 +771,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
}
if (keep_cache_objects) {
+ verify_index_checksum = 1;
read_cache();
for (i = 0; i < active_nr; i++) {
unsigned int mode;