Re: [PATCH v2 1/3] fsck: verify commit graph when implicitly enabled
- From
Glen Choo <chooglen@google.com>
- Date
- Oct 1, 2021, 17:28 UTC
- Message-ID
- <kl6lpmsoac2w.fsf@chooglen-macbookpro.roam.corp.google.com>
- In-Reply-To
- <CAPig+cSTEwObVOajvtVA0BQo0vB74BDN4-f6Gi1tYrEt-BzceQ@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
> That was my thought, as well. (I wasn't quite sure why Taylor > recommended test_config() over `-c` which you used originally. It may > just be his personal preference. Perhaps he can chime in?)
I'd also appreciate thoughts on test_config() over `-c` :). I won't re-roll this series yet in case there's more to the test_config() story, but I've included a patch that shows the `-c` work that we discussed.
--- t/t5318-commit-graph.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index 42e785cb6e..4fcfc2ebbc 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -680,7 +680,7 @@ test_expect_success 'git fsck (checks commit-graph when config set to true)' ' corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \ "incorrect checksum" && cp commit-graph-pre-write-test $objdir/info/commit-graph && - test_must_fail git fsck + test_must_fail git -c core.commitGraph=true fsck ' test_expect_success 'git fsck (ignores commit-graph when config set to false)' ' @@ -689,14 +689,13 @@ test_expect_success 'git fsck (ignores commit-graph when config set to false)' ' corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \ "incorrect checksum" && cp commit-graph-pre-write-test $objdir/info/commit-graph && - test_config core.commitGraph false && - git fsck + git -c core.commitGraph=false fsck ' test_expect_success 'git fsck (checks commit-graph when config unset)' ' + cd "$TRASH_DIRECTORY/full" && test_when_finished "git config core.commitGraph true" && - cd "$TRASH_DIRECTORY/full" && git fsck && corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \ "incorrect checksum" &&
-- 2.33.0.800.g4c38ced690-goog