From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
git@vger.kernel.org, "Taylor Blau" <me@ttaylorr.com>
Subject: Re: ab/fsck-unexpected-type (and "cat-file replace handling and optimization")
Date: Thu, 07 Oct 2021 14:37:02 -0700 [thread overview]
Message-ID: <xmqq8rz4pldt.fsf@gitster.g> (raw)
In-Reply-To: <YVzLRSa9/vUWJPL0@coredump.intra.peff.net> (Jeff King's message of "Tue, 5 Oct 2021 18:01:41 -0400")
Jeff King <peff@peff.net> writes:
> I don't mind rebasing on top if that's easier for Junio, but in that
> case it may make sense to float the test cleanup to the front of the
> series.
Yeah, I would rather not to see such a rebase (and I hate the kind
of churns we seem to be allowing more and more in our codebase that
causes needless textual conflicts. We should really slow down and
make fewer pointless "clean-up" that disrupts real work).
> diff --cc t/t1006-cat-file.sh
> index a5e7401af8,4a753705ec..0000000000
> --- a/t/t1006-cat-file.sh
> +++ b/t/t1006-cat-file.sh
> @@@ -475,9 -332,18 +475,13 @@@ test_expect_success "Size of broken obj
> test_cmp expect actual
> '
>
> + test_expect_success 'clean up broken object' '
> - rm .git/objects/$(test_oid_to_path $bogus_sha1)
> ++ rm .git/objects/$(test_oid_to_path $bogus_short_sha1)
> + '
> +
> -bogus_type="abcdefghijklmnopqrstuvwxyz1234679"
> -bogus_content="bogus"
> -bogus_size=$(strlen "$bogus_content")
> -bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
> -
> test_expect_success "Type of broken object is correct when type is large" '
> - echo $bogus_type >expect &&
> - git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
> + echo $bogus_long_type >expect &&
> + git cat-file -t --allow-unknown-type $bogus_long_sha1 >actual &&
> test_cmp expect actual
> '
These look sensible, but ...
> - test_expect_success 'cat-file -t and -s on corrupt loose object' '
> - git init --bare corrupt-loose.git &&
> - (
> - cd corrupt-loose.git &&
> ...
> - test_must_fail git fsck 2>err.fsck &&
> - grep "^error: inflate: data stream error (" err.fsck
> - )
... what's this lossage of the whole new test?
> + test_expect_success 'clean up broken object' '
> - rm .git/objects/$(test_oid_to_path $bogus_sha1)
> ++ rm .git/objects/$(test_oid_to_path $bogus_long_sha1)
> '
Again, this one makes sense.
Thanks.
next prev parent reply other threads:[~2021-10-07 21:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-04 23:44 What's cooking in git.git (Oct 2021, #01; Mon, 4) Junio C Hamano
2021-10-04 23:52 ` Taylor Blau
2021-10-05 16:01 ` ab/refs-errno-cleanup Ævar Arnfjörð Bjarmason
2021-10-05 16:47 ` hm/paint-hits-in-log-grep Ævar Arnfjörð Bjarmason
2021-10-05 17:07 ` ab/designated-initializers-more Ævar Arnfjörð Bjarmason
2021-10-05 20:47 ` ab/fsck-unexpected-type (and "cat-file replace handling and optimization") Ævar Arnfjörð Bjarmason
2021-10-05 22:01 ` Jeff King
2021-10-06 8:54 ` Ævar Arnfjörð Bjarmason
2021-10-07 21:37 ` Junio C Hamano [this message]
2021-10-08 2:25 ` Jeff King
2021-10-08 20:50 ` Junio C Hamano
2021-10-06 10:14 ` ab/make-sparse-for-real Ævar Arnfjörð Bjarmason
2021-10-06 10:17 ` ab/parse-options-cleanup & ab/align-parse-options-help & ab/help-config-vars Ævar Arnfjörð Bjarmason
2021-10-06 16:44 ` Junio C Hamano
2021-10-06 10:26 ` ab/refs-errno-cleanup & "errno" removal in the refs backend Ævar Arnfjörð Bjarmason
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=xmqq8rz4pldt.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.