From: Taylor Blau <me@ttaylorr.com>
To: Jeff King <peff@peff.net>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Taylor Blau" <me@ttaylorr.com>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 2/7] t: introduce tests for unexpected object types
Date: Fri, 5 Apr 2019 22:31:15 -0700 [thread overview]
Message-ID: <20190406053115.GB37216@Taylors-MBP.hsd1.wa.comcast.net> (raw)
In-Reply-To: <20190405182412.GC2284@sigill.intra.peff.net>
On Fri, Apr 05, 2019 at 02:24:12PM -0400, Jeff King wrote:
> On Fri, Apr 05, 2019 at 12:50:33PM +0200, SZEDER Gábor wrote:
>
> > > +test_expect_failure 'traverse unexpected non-tree entry (seen)' '
> > > + test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1
> >
> > This test saves standard output and error, but doesn't look at them.
>
> I think we want to be checking for "not a tree" here, which is later
> added with the fix. But either we should have the test_i18ngrep here
> initially, or we should add both the redirect and the grep with the fix.
Right, pointing out that saving the standard output and error of 'git
rev-list' and then doing nothing with it as being redundant is certainly
right.
I think that the 'fix' here is to write instead:
+test_expect_failure 'traverse unexpected non-tree entry (seen)' '
+ test_must_fail git rev-list --objects $blob $broken_tree
+'
And _then_ add '>output 2>&1 &&' to the end, capturing the output, as
well as the appropriate test_i18ngrep. This matches the pattern that
we've been otherwise following in the series so far.
(FWIW, I think that this is also the result of squashing the series down
a few times...)
> > > +test_expect_success 'setup unexpected non-commit parent' '
> > > + git cat-file commit $commit |
> > > + perl -lpe "/^author/ && print q(parent $blob)" \
> > > + >broken-commit &&
> >
> > Don't run git commands upstream of a pipe, because the pipe hides
> > their exit code. This applies to several other tests below as well.
>
> I disagree with that rule here. We're not testing "cat-file" in any
> meaningful way, but just getting some stock output from a known-good
> commit.
>
> > Wouldn't a 'sed' one-liner suffice, so we won't have yet another perl
> > dependency?
>
> Heh, this was actually the subject of much discussion before the patches
> hit the list. If you can write such a one-liner that is both readable
> and portable, please share it. I got disgusted with sed and suggested
> this perl.
I admit that this gave me a chuckle, too. When preparing this series to
send it, I did something like:
$ git rebase -x 'make && cd t && ./t6102-*.sh
but found that it was broken on the BSD sed that ships with macOS
10.14.2. I didn't notice until preparing the series for upstream because
I wrote it on my Debian 9 VM, with GNU sed (where it is not broken ;-)).
It was originally written as:
test_expect_success 'setup unexpected non-commit parent' '
git cat-file commit $commit | sed "/^tree/a\
parent $blob" >broken-commit &&
broken_commit="$(git hash-object -w --literally -t commit \
broken-commit)"
'
> -Peff
Thanks,
Taylor
next prev parent reply other threads:[~2019-04-06 5:31 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-05 3:37 [PATCH 0/7] harden unexpected object types checks Taylor Blau
2019-04-05 3:37 ` [PATCH 1/7] t: move 'hex2oct' into test-lib-functions.sh Taylor Blau
2019-04-05 3:37 ` [PATCH 2/7] t: introduce tests for unexpected object types Taylor Blau
2019-04-05 10:50 ` SZEDER Gábor
2019-04-05 18:24 ` Jeff King
2019-04-05 18:42 ` SZEDER Gábor
2019-04-05 18:52 ` Jeff King
2019-04-07 21:00 ` Ævar Arnfjörð Bjarmason
2019-04-09 2:29 ` Taylor Blau
2019-04-09 9:14 ` Ævar Arnfjörð Bjarmason
2019-04-10 1:59 ` Taylor Blau
2019-04-08 5:27 ` Junio C Hamano
2019-04-05 19:25 ` Eric Sunshine
2019-04-05 20:53 ` Jeff King
2019-04-06 5:33 ` Taylor Blau
2019-04-08 6:44 ` Junio C Hamano
2019-04-09 2:30 ` Taylor Blau
2019-04-09 3:28 ` Eric Sunshine
2019-04-09 5:08 ` Taylor Blau
2019-04-09 8:02 ` Eric Sunshine
2019-04-10 1:54 ` Taylor Blau
2019-04-06 5:31 ` Taylor Blau [this message]
2019-04-05 18:31 ` Jeff King
2019-04-06 5:23 ` Taylor Blau
2019-04-05 3:37 ` [PATCH 3/7] list-objects.c: handle unexpected non-blob entries Taylor Blau
2019-04-05 3:37 ` [PATCH 4/7] list-objects.c: handle unexpected non-tree entries Taylor Blau
2019-04-05 3:37 ` [PATCH 5/7] get_commit_tree(): return NULL for broken tree Taylor Blau
2019-04-05 3:37 ` [PATCH 6/7] rev-list: let traversal die when --missing is not in use Taylor Blau
2019-04-05 18:41 ` Jeff King
2019-04-06 5:36 ` Taylor Blau
2019-04-07 13:41 ` Jeff King
2019-04-09 2:11 ` Taylor Blau
2019-04-05 3:37 ` [PATCH 7/7] rev-list: detect broken root trees Taylor Blau
2019-04-10 2:13 ` [PATCH v2 0/7] harden unexpected object types checks Taylor Blau
2019-04-10 2:13 ` [PATCH v2 1/7] t: move 'hex2oct' into test-lib-functions.sh Taylor Blau
2019-04-10 2:13 ` [PATCH v2 2/7] t: introduce tests for unexpected object types Taylor Blau
2019-04-10 2:13 ` [PATCH v2 3/7] list-objects.c: handle unexpected non-blob entries Taylor Blau
2019-04-10 2:13 ` [PATCH v2 4/7] list-objects.c: handle unexpected non-tree entries Taylor Blau
2019-04-10 2:13 ` [PATCH v2 5/7] get_commit_tree(): return NULL for broken tree Taylor Blau
2019-04-10 2:13 ` [PATCH v2 6/7] rev-list: let traversal die when --missing is not in use Taylor Blau
2019-04-10 2:13 ` [PATCH v2 7/7] rev-list: detect broken root trees Taylor Blau
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=20190406053115.GB37216@Taylors-MBP.hsd1.wa.comcast.net \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=szeder.dev@gmail.com \
/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).