summaryrefslogtreecommitdiff
path: root/builtin/fsck.c
diff options
context:
space:
mode:
authorGlen Choo <chooglen@google.com>2021-10-15 20:16:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-10-15 21:30:08 (GMT)
commitdc5570872f684f7c838fe7571225d279243b8700 (patch)
treea80685466218c7f07d2d4f9f0607cbb6b0ee099e /builtin/fsck.c
parentf30e4d854bb8462d1a4da697ad95501d33fe4425 (diff)
downloadgit-dc5570872f684f7c838fe7571225d279243b8700.zip
git-dc5570872f684f7c838fe7571225d279243b8700.tar.gz
git-dc5570872f684f7c838fe7571225d279243b8700.tar.bz2
fsck: verify multi-pack-index when implictly enabled
Like the previous commit, change fsck to check the "core_multi_pack_index" variable set in "repo-settings.c" instead of reading the "core.multiPackIndex" config variable. This fixes a bug where we wouldn't verify midx if the config key was missing. This bug was introduced in 18e449f86b (midx: enable core.multiPackIndex by default, 2020-09-25) where core.multiPackIndex was turned on by default. Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fsck.c')
-rw-r--r--builtin/fsck.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 1c4e485..5bbe806 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -925,7 +925,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
}
}
- if (!git_config_get_bool("core.multipackindex", &i) && i) {
+ if (the_repository->settings.core_multi_pack_index) {
struct child_process midx_verify = CHILD_PROCESS_INIT;
const char *midx_argv[] = { "multi-pack-index", "verify", NULL, NULL, NULL };