[PATCH v2 2/3] fsck: verify multi-pack-index when implictly enabled
STALE1815d
From: Glen Choo <hidden>
Date: 2021-09-17 22:55:19
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 5 in this series.
Revisions (5)
Like the previous commit, the_repository->settings.core_multi_pack_index
is preferable to reading "core.multiPackIndex" from the config because
prepare_repo_settings() sets a default value for
the_repository->settings. This worked fine until core.multiPackIndex was
enabled by default in 18e449f86b (midx: enable core.multiPackIndex by
default, 2020-09-25).
Replace git_config_get_bool("core.multiPackIndex") in fsck with the
equivalent call to the_repository->settings.multi_pack_index.
Signed-off-by: Glen Choo <redacted>
---
builtin/fsck.c | 2 +-
t/t5319-multi-pack-index.sh | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 1c4e485b66..5bbe8068ec 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 };
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 3d4d9f10c3..704db122b1 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh@@ -407,7 +407,9 @@ test_expect_success 'verify incorrect offset' ' test_expect_success 'git-fsck incorrect offset' ' corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ "incorrect object offset" \ - "git -c core.multipackindex=true fsck" + "git -c core.multipackindex=true fsck" && + test_must_fail git fsck && + git -c core.multipackindex=false fsck ' test_expect_success 'corrupt MIDX is not reused' '
--
2.33.0.464.g1972c5931b-goog