Merge branch 'rs/checkout-am-fix-unborn' into maint

diff --git a/builtin/fsck.c b/builtin/fsck.c
index f76e4163abbac825c00111504a040f8091d967d3..b5e13a45560f9338a65191c22d213f33052bf9b9 100644 (file)
--- 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;