From: Taylor Blau <me@ttaylorr•com>
To: Derrick Stolee <derrickstolee@github•com>
Cc: Derrick Stolee via GitGitGadget <gitgitgadget@gmail•com>,
git@vger•kernel.org, gitster@pobox•com
Subject: Re: [PATCH 2/4] fsck: check rev-index checksums
Date: Tue, 18 Apr 2023 10:51:23 -0400 [thread overview]
Message-ID: <ZD6ua4dSynRWmW2a@nand.local> (raw)
In-Reply-To: <2628249e-fe9a-d15c-5414-33d815b35cd1@github.com>
On Tue, Apr 18, 2023 at 10:27:57AM -0400, Derrick Stolee wrote:
> >> +test_expect_success 'fsck catches invalid checksum' '
> >> + revfile=$(ls corrupt/.git/objects/pack/pack-*.rev) &&
> >
> > Would this test be tighter if we introduced a sub-shell and cd'd into
> > "corrupt" here?
>
> corrupt_rev_and_verify does the subshell thing. Why should we do that
> here in the test?
I was thinking that it might be more concise if you moved the subshell
to the test and out of corrupt_rev_and_verify. In addition to making
corrupt_rev_and_verify work in other instances where the repository
isn't required to be in a directory named "corrupt", I think it
simplifies the result.
Here's what I was thinking, as a diff on top of this patch:
--- >8 ---
diff --git a/t/t5325-reverse-index.sh b/t/t5325-reverse-index.sh
index 6b7c709a1f..7dfbaf6b37 100755
--- a/t/t5325-reverse-index.sh
+++ b/t/t5325-reverse-index.sh
@@ -160,29 +160,30 @@ test_expect_success 'set up rev-index corruption tests' '
'
corrupt_rev_and_verify () {
- (
- pos="$1" &&
- value="$2" &&
- error="$3" &&
+ pos="$1" &&
+ value="$2" &&
+ error="$3" &&
- cd corrupt &&
- revfile=$(ls .git/objects/pack/pack-*.rev) &&
+ revfile=$(ls .git/objects/pack/pack-*.rev) &&
- # Reset to original rev-file.
- cp $revfile.bak $revfile &&
+ # Reset to original rev-file.
+ cp $revfile.bak $revfile &&
- printf "$value" | dd of=$revfile bs=1 seek="$pos" conv=notrunc &&
- test_must_fail git fsck 2>err &&
- grep "$error" err
- )
+ printf "$value" | dd of=$revfile bs=1 seek="$pos" conv=notrunc &&
+ test_must_fail git fsck 2>err &&
+ grep "$error" err
}
test_expect_success 'fsck catches invalid checksum' '
- revfile=$(ls corrupt/.git/objects/pack/pack-*.rev) &&
- orig_size=$(wc -c <$revfile) &&
- hashpos=$((orig_size - 10)) &&
- corrupt_rev_and_verify $hashpos bogus \
- "invalid checksum"
+ (
+ cd corrupt &&
+
+ revfile=$(ls .git/objects/pack/pack-*.rev) &&
+ orig_size=$(wc -c <$revfile) &&
+ hashpos=$((orig_size - 10)) &&
+ corrupt_rev_and_verify $hashpos bogus \
+ "invalid checksum"
+ )
'
test_done
--- 8< ---
If you do take my suggestion, make sure to remember to come back in
patches 3/4 and 4/4 and adjust those instances of
'corrupt_rev_and_verify' to first change into "corrupt".
Thanks,
Taylor
next prev parent reply other threads:[~2023-04-18 14:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-17 16:21 [PATCH 0/4] git fsck: check pack rev-index files Derrick Stolee via GitGitGadget
2023-04-17 16:21 ` [PATCH 1/4] fsck: create scaffolding for rev-index checks Derrick Stolee via GitGitGadget
2023-04-17 22:20 ` Taylor Blau
2023-04-17 16:21 ` [PATCH 2/4] fsck: check rev-index checksums Derrick Stolee via GitGitGadget
2023-04-17 22:15 ` Junio C Hamano
2023-04-18 14:24 ` Derrick Stolee
2023-04-17 22:24 ` Taylor Blau
2023-04-18 14:27 ` Derrick Stolee
2023-04-18 14:51 ` Taylor Blau [this message]
2023-04-18 14:57 ` Derrick Stolee
2023-04-18 15:03 ` Taylor Blau
2023-04-17 16:21 ` [PATCH 3/4] fsck: check rev-index position values Derrick Stolee via GitGitGadget
2023-04-17 22:01 ` Junio C Hamano
2023-04-18 14:32 ` Derrick Stolee
2023-04-17 22:52 ` Taylor Blau
2023-04-17 16:21 ` [PATCH 4/4] fsck: validate .rev file header Derrick Stolee via GitGitGadget
2023-04-17 21:37 ` [PATCH 0/4] git fsck: check pack rev-index files Junio C Hamano
2023-04-18 15:23 ` Taylor Blau
2023-04-18 16:59 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZD6ua4dSynRWmW2a@nand.local \
--to=me@ttaylorr$(echo .)com \
--cc=derrickstolee@github$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox