From: Taylor Blau <me@ttaylorr.com>
To: Glen Choo <chooglen@google.com>
Cc: git@vger.kernel.org, derrickstolee@github.com
Subject: Re: [PATCH 2/3] fsck: verify multi-pack-index when implictly enabled
Date: Mon, 13 Sep 2021 15:35:15 -0400 [thread overview]
Message-ID: <YT+n81yGPYEiMXwQ@nand.local> (raw)
In-Reply-To: <20210913181221.42635-3-chooglen@google.com>
On Mon, Sep 13, 2021 at 11:12:20AM -0700, Glen Choo wrote:
> 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.
My same suggestion about referencing the first commit for which this
would have been broken applies here, too. In this case, that'd be
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 <chooglen@google.com>
> ---
> 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 };
Good.
> 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
> +'
This test is a little awkward, since it looks like the first command is
the same as the previous test (making it unnecessary). But it turns out
that it *is* necessary, since it sets up the corrupt MIDX (which is
thrown away at the end of each test).
So I would suggest one of two things:
- Either replace this with a more flexible version of
corrupt_midx_and_verify that allows the enclosing test to pass. Note
that this may be awkward, since the whole point is that we want to
notice the corruption in the first place.
- Or, (more favorably) combine this all into a single test, like so:
corrupt_midx_and_verify "$MIDX_BYTE_OFFSET" "\377" $objdir \
"incorrect object offset" \
"git fsck" &&
test_must_fail git -c core.multiPackIndex=true fsck &&
git -c core.multiPackIndex=false fsck
Which does all of the setup for the three tests at once, and then
specifies each behavior individually.
Thanks,
Taylor
next prev parent reply other threads:[~2021-09-13 19:35 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-13 18:12 [PATCH 0/3] Use default values from settings instead of config Glen Choo
2021-09-13 18:12 ` [PATCH 1/3] fsck: verify commit graph when implicitly enabled Glen Choo
2021-09-13 19:29 ` Taylor Blau
2021-09-13 19:33 ` Eric Sunshine
2021-09-13 19:36 ` Taylor Blau
2021-09-13 23:15 ` Glen Choo
2021-09-13 23:32 ` Eric Sunshine
2021-09-14 1:09 ` Taylor Blau
2021-09-14 2:05 ` Eric Sunshine
2021-09-14 1:07 ` Taylor Blau
2021-09-13 18:12 ` [PATCH 2/3] fsck: verify multi-pack-index when implictly enabled Glen Choo
2021-09-13 19:35 ` Taylor Blau [this message]
2021-09-13 18:12 ` [PATCH 3/3] gc: perform incremental repack " Glen Choo
2021-09-13 19:37 ` Taylor Blau
2021-09-14 17:41 ` Glen Choo
2021-09-14 4:00 ` Bagas Sanjaya
2021-09-16 17:15 ` Glen Choo
2021-09-13 19:19 ` [PATCH 0/3] Use default values from settings instead of config Taylor Blau
2021-09-17 22:54 ` [PATCH v2 " Glen Choo
2021-09-17 22:54 ` [PATCH v2 1/3] fsck: verify commit graph when implicitly enabled Glen Choo
2021-09-29 6:09 ` Eric Sunshine
2021-09-30 18:00 ` Glen Choo
2021-09-30 18:35 ` Glen Choo
2021-09-30 18:39 ` Eric Sunshine
2021-10-01 17:28 ` Glen Choo
2021-09-17 22:54 ` [PATCH v2 2/3] fsck: verify multi-pack-index when implictly enabled Glen Choo
2021-09-29 6:20 ` Eric Sunshine
2021-09-29 22:56 ` Glen Choo
2021-09-17 22:54 ` [PATCH v2 3/3] gc: perform incremental repack " Glen Choo
2021-09-29 6:39 ` Eric Sunshine
2021-09-27 17:59 ` [PATCH v2 0/3] Use default values from settings instead of config Glen Choo
2021-09-29 6:43 ` Eric Sunshine
2021-09-29 22:53 ` Glen Choo
2021-10-05 0:19 ` [PATCH v3 " Glen Choo
2021-10-05 0:19 ` [PATCH v3 1/3] fsck: verify commit graph when implicitly enabled Glen Choo
2021-10-05 0:19 ` [PATCH v3 2/3] fsck: verify multi-pack-index when implictly enabled Glen Choo
2021-10-05 0:19 ` [PATCH v3 3/3] gc: perform incremental repack " Glen Choo
2021-10-05 11:57 ` [PATCH v3 0/3] Use default values from settings instead of config Ævar Arnfjörð Bjarmason
2021-10-05 17:43 ` Derrick Stolee
2021-10-05 19:10 ` Ævar Arnfjörð Bjarmason
2021-10-05 22:25 ` Glen Choo
2021-10-09 7:24 ` Junio C Hamano
2021-10-11 19:58 ` Glen Choo
2021-10-11 20:08 ` Junio C Hamano
2021-10-11 20:48 ` Glen Choo
2021-10-12 17:42 ` [PATCH v4 " Glen Choo
2021-10-12 17:42 ` [PATCH v4 1/3] fsck: verify commit graph when implicitly enabled Glen Choo
2021-10-12 17:42 ` [PATCH v4 2/3] fsck: verify multi-pack-index when implictly enabled Glen Choo
2021-10-12 17:42 ` [PATCH v4 3/3] gc: perform incremental repack " Glen Choo
2021-10-12 20:23 ` [PATCH v4 0/3] Use default values from settings instead of config Junio C Hamano
2021-10-12 20:34 ` Ævar Arnfjörð Bjarmason
2021-10-12 22:29 ` Glen Choo
2021-10-14 15:53 ` Ævar Arnfjörð Bjarmason
2021-10-13 13:12 ` Derrick Stolee
2021-10-13 15:57 ` Ævar Arnfjörð Bjarmason
2021-10-14 16:53 ` Derrick Stolee
2021-10-14 22:21 ` Glen Choo
2021-10-14 23:38 ` Ævar Arnfjörð Bjarmason
2021-10-14 22:25 ` Junio C Hamano
2021-10-15 15:57 ` Junio C Hamano
2021-10-15 20:16 ` [PATCH v5 " Glen Choo
2021-10-15 20:16 ` [PATCH v5 1/3] fsck: verify commit graph when implicitly enabled Glen Choo
2021-10-15 20:16 ` [PATCH v5 2/3] fsck: verify multi-pack-index when implictly enabled Glen Choo
2021-10-15 20:16 ` [PATCH v5 3/3] gc: perform incremental repack " Glen Choo
2021-10-15 21:31 ` [PATCH v5 0/3] Use default values from settings instead of config Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YT+n81yGPYEiMXwQ@nand.local \
--to=me@ttaylorr.com \
--cc=chooglen@google.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).