From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Taylor Blau <me@ttaylorr.com>,
Jeff King <peff@peff.net>,
Jonathan Tan <jonathantanmy@google.com>,
Kousik Sanagavarapu <five231003@gmail.com>
Subject: Re: [PATCH v2 1/3] object tests: add test for unexpected objects in tags
Date: Fri, 30 Dec 2022 13:25:51 +0900 [thread overview]
Message-ID: <xmqqzgb5jz5c.fsf@gitster.g> (raw)
In-Reply-To: <patch-v2-1.3-0abf873f1e3-20221230T011725Z-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Fri, 30 Dec 2022 02:52:14 +0100")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> +test_expect_success !SANITIZE_LEAK 'setup unexpected non-tag tag' '
> + test_when_finished "git tag -d tag-commit tag-tag" &&
> +
> + git tag -a -m"my tagged commit" tag-commit $commit &&
> + tag_commit=$(git rev-parse tag-commit) &&
> + git tag -a -m"my tagged tag" tag-tag tag-commit &&
> + tag_tag=$(git rev-parse tag-tag) &&
> +
> + git cat-file tag tag-tag >good-tag-tag &&
> + git cat-file tag tag-commit >good-commit-tag &&
> +
> + sed -e "s/$tag_commit/$commit/" <good-tag-tag >broken-tag-tag-commit &&
> + sed -e "s/$tag_commit/$tree/" <good-tag-tag >broken-tag-tag-tree &&
> + sed -e "s/$tag_commit/$blob/" <good-tag-tag >broken-tag-tag-blob &&
> +
> + sed -e "s/$commit/$tag_commit/" <good-commit-tag >broken-commit-tag-tag &&
> + sed -e "s/$commit/$tree/" <good-commit-tag >broken-commit-tag-tree &&
> + sed -e "s/$commit/$blob/" <good-commit-tag >broken-commit-tag-blob &&
> +
> + tag_tag_commit=$(git hash-object -w -t tag broken-tag-tag-commit) &&
> + tag_tag_tree=$(git hash-object -w -t tag broken-tag-tag-tree) &&
> + tag_tag_blob=$(git hash-object -w -t tag broken-tag-tag-blob) &&
If the second block of 3 sed commands to prepare data for tags that
incorrectly claim to point at a commit are moved a bit, i.e. make
"sed's && hash-object's && update-ref's" as a logical group, the
above would become slightly easier to read, but in any case the
set-up step looks quite repetitive and boring to read ;-)
There is no strong reason to use broken-tag-* temporary files,
though. Each of them is used exactly once, but you can just
pipe the output from "sed" to "git hash-object --stdin" without
losing any exit status, e.g.
tag_tag_commit=$(sed -e '...' good-commit-tag |
git hash-object -w -t tag --stdin)
> + git update-ref refs/tags/tag_tag_commit $tag_tag_commit &&
> + git update-ref refs/tags/tag_tag_tree $tag_tag_tree &&
> + git update-ref refs/tags/tag_tag_blob $tag_tag_blob &&
> +
> + commit_tag_tag=$(git hash-object -w -t tag broken-commit-tag-tag) &&
> + commit_tag_tree=$(git hash-object -w -t tag broken-commit-tag-tree) &&
> + commit_tag_blob=$(git hash-object -w -t tag broken-commit-tag-blob) &&
> +
> + git update-ref refs/tags/commit_tag_tag $commit_tag_tag &&
> + git update-ref refs/tags/commit_tag_tree $commit_tag_tree &&
> + git update-ref refs/tags/commit_tag_blob $commit_tag_blob
> +'
> +
> +test_expect_failure !SANITIZE_LEAK 'traverse unexpected incorrectly typed tag (to commit & tag)' '
> + test_must_fail git rev-list --objects $tag_tag_commit 2>err &&
Does this have to be "rev-list --objects" or would something like
"cat-file -t $tag_tag_commit^0" do?
Especially because "rev-list --objects" is a rather heavy-weight
command that does a lot of checking, I am wondering if it is
sensible to rely on the assumption that the errors expected below
will stay to be the only errors we get before the command exits
(hence a wish to replace it with a more narrowly focused comamnd).
> + cat >expect <<-EOF &&
> + error: object $commit is a commit, not a tag
> + fatal: bad object $commit
> + EOF
> + test_cmp expect err &&
> +test_expect_failure !SANITIZE_LEAK 'traverse unexpected objects with for-each-ref' '
> + cat >expect <<-EOF &&
> + error: bad tag pointer to $tree in $tag_tag_tree
> + fatal: parse_object_buffer failed on $tag_tag_tree for refs/tags/tag_tag_tree
> + EOF
This depends on the fact that among the broken ones tag_tag_tree
sorts the earliest (and the command stops after barfing on a single
bad object), doesn't it? I wonder if it makes the test more robust
by feeding refs/tags/tag_tag_tree from the command line to limit the
tips the command needs to inspect.
> +>fsck-object-isa
Move it inside the setup as the first command in case "git fsck"
succeeds?
> +test_expect_success 'setup: unexpected objects with fsck' '
> + test_must_fail git fsck 2>err &&
> + sed -n -e "/^error: object .* is a .*, not a .*$/ {
> + s/^error: object \([0-9a-f]*\) is a \([a-z]*\), not a [a-z]*$/\\1 \\2/;
> + p;
> + }" <err >fsck-object-isa
> +'
next prev parent reply other threads:[~2022-12-30 4:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-16 16:39 [RFC][PATCH] object.c: use has_object() instead of repo_has_object_file() Kousik Sanagavarapu
2022-11-16 18:20 ` Jeff King
2022-11-16 21:14 ` Jonathan Tan
2022-11-17 22:37 ` [PATCH 0/2] fixing parse_object() check for type mismatch Jeff King
2022-11-17 22:37 ` [PATCH 1/2] parse_object(): drop extra "has" check before checking object type Jeff King
2022-11-17 22:41 ` [PATCH 2/2] parse_object(): check on-disk type of suspected blob Jeff King
2022-11-18 0:36 ` Ævar Arnfjörð Bjarmason
2022-11-21 19:21 ` Jeff King
2022-11-18 11:46 ` [PATCH 0/4] tag: don't misreport type of tagged objects in errors Ævar Arnfjörð Bjarmason
2022-11-18 11:46 ` [PATCH 1/4] object-file.c: free the "t.tag" in check_tag() Ævar Arnfjörð Bjarmason
2022-11-18 11:46 ` [PATCH 2/4] object tests: add test for unexpected objects in tags Ævar Arnfjörð Bjarmason
2022-11-18 11:46 ` [PATCH 3/4] tag: don't misreport type of tagged objects in errors Ævar Arnfjörð Bjarmason
2022-11-18 11:46 ` [PATCH 4/4] tag: don't emit potentially incorrect "object is a X, not a Y" Ævar Arnfjörð Bjarmason
2022-12-30 1:52 ` [PATCH v2 0/3] tag: don't misreport type of tagged objects in errors Ævar Arnfjörð Bjarmason
2022-12-30 1:52 ` [PATCH v2 1/3] object tests: add test for unexpected objects in tags Ævar Arnfjörð Bjarmason
2022-12-30 4:25 ` Junio C Hamano [this message]
2022-12-30 1:52 ` [PATCH v2 2/3] tag: don't misreport type of tagged objects in errors Ævar Arnfjörð Bjarmason
2022-12-30 6:07 ` Junio C Hamano
2022-12-30 1:52 ` [PATCH v2 3/3] tag: don't emit potentially incorrect "object is a X, not a Y" Ævar Arnfjörð Bjarmason
2022-11-18 19:05 ` [PATCH 0/2] fixing parse_object() check for type mismatch Taylor Blau
2022-11-21 19:26 ` Jeff King
2022-11-22 0:05 ` Æ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
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=xmqqzgb5jz5c.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=five231003@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--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.
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).