[PATCH 2/3] fsck: verify multi-pack-index when implictly enabled
flat view
STALE1842d
SUPERSEDED
From: Glen Choo <hidden>
Date: 2021-09-13 18:12:41
Subsystem:
the rest · Maintainer:
Linus Torvalds
Status: Superseded by v5 (posted 2021-10-15). [go to v5]
Revision v1 (5 revisions archived).
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.
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 | 15 ++++++++++++++-
2 files changed, 15 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..1a17446cf0 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh@@ -404,12 +404,25 @@ test_expect_success 'verify incorrect offset' ' "incorrect object offset" ' -test_expect_success 'git-fsck incorrect offset' ' +test_expect_success 'git-fsck incorrect offset (config set to true)' ' corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ "incorrect object offset" \ "git -c core.multipackindex=true fsck" ' +test_expect_success 'git-fsck incorrect offset (config set to false)' ' + corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ + "incorrect object offset" \ + "git -c core.multipackindex=true fsck" && + git -c core.multipackindex=false fsck +' + +test_expect_success 'git-fsck incorrect offset (config unset)' ' + corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ + "incorrect object offset" \ + "git fsck" +' + test_expect_success 'corrupt MIDX is not reused' ' corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ "incorrect object offset" &&
--
2.33.0.309.g3052b89438-goog