[PATCH 3/6] t5324: harmonize sha1/sha256 graph chain corruption
- From
Jeff King <peff@peff.net>
- Date
- Sep 26, 2023, 05:58 UTC
- Message-ID
- <20230926055836.GC1341418@coredump.intra.peff.net>
- In-Reply-To
- <20230926055452.GA1341109@coredump.intra.peff.net>
In t5324.20, we corrupt a hex character 60 bytes into the graph chain file. Since the file consists of two hash identifiers, one per line, the corruption differs between sha1 and sha256. In a sha1 repository, the corruption is on the second line, and in a sha256 repository, it is on the first.
We should of course detect the problem with either line. But as the next few patches will show (and fix), that is not the case (in fact, we currently do not exit non-zero for either line!). And while at the end of our series we'll catch all errors, our intermediate states will have differing behavior between the two hashes.
Let's make this test behave consistently with either hash by always corrupting the first line. We'll add additional tests that explicitly cover the second line as we fix those bugs.
Signed-off-by: Jeff King <peff@peff.net> --- t/t5324-split-commit-graph.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh index 36c4141e67..e335ef87a6 100755 --- a/t/t5324-split-commit-graph.sh +++ b/t/t5324-split-commit-graph.sh @@ -316,11 +316,11 @@ test_expect_success 'verify after commit-graph-chain corruption' ' git clone --no-hardlinks . verify-chain && ( cd verify-chain && - corrupt_file "$graphdir/commit-graph-chain" 60 "G" && + corrupt_file "$graphdir/commit-graph-chain" 30 "G" && git commit-graph verify 2>test_err && grep -v "^+" test_err >err && test_i18ngrep "invalid commit-graph chain" err && - corrupt_file "$graphdir/commit-graph-chain" 60 "A" && + corrupt_file "$graphdir/commit-graph-chain" 30 "A" && git commit-graph verify 2>test_err && grep -v "^+" test_err >err && test_i18ngrep "unable to find all commit-graph files" err
-- 2.42.0.758.gd56856b565