From: Taylor Blau <me@ttaylorr.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: "Taylor Blau" <me@ttaylorr.com>,
"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Git List" <git@vger.kernel.org>
Subject: Re: [PATCH 2/7] t: introduce tests for unexpected object types
Date: Mon, 8 Apr 2019 22:08:57 -0700 [thread overview]
Message-ID: <20190409050857.GI81620@Taylors-MBP.hsd1.wa.comcast.net> (raw)
In-Reply-To: <CAPig+cS+4tTAAWsp+KX2-__kcvgDABQQCmz63d6pQUa6Qu3LKw@mail.gmail.com>
Hi Eric,
On Mon, Apr 08, 2019 at 11:28:19PM -0400, Eric Sunshine wrote:
> On Mon, Apr 8, 2019 at 10:31 PM Taylor Blau <me@ttaylorr.com> wrote:
> > On Mon, Apr 08, 2019 at 03:44:25PM +0900, Junio C Hamano wrote:
> > > Eric Sunshine <sunshine@sunshineco.com> writes:
> > > >> > > + git cat-file commit $commit |
> > > >> > > + perl -lpe "/^author/ && print q(parent $blob)" \
> > > >> > > + >broken-commit &&
> > > >
> > > > Trivial and portable 'sed' equivalent:
> > > >
> > > > git cat-file commit $commit | sed "/^author/ { h; s/.*/parent $blob/; G; }"
> > >
> > > Looks good. I had a bit of head scratching moment when I saw that
> > > "perl -lpe" one-liner; this sed expression may not be crystal clear
> > > to those who are not used to, but it is not so bad, either.
> >
> > Should I take this as your endorsement of putting 'git' on the left-hand
> > side of a pipe? ;-).
>
> I suspect that Junio's "Looks good" was referring to the 'sed expression.
I think that you are right -- and I'll happily _not_ introduce more Git
on the left-hand-side of a pipe instances.
I noticed a few more instances in t6102 where we do something similar
to:
git cat-file -p <something> | sed ... >broken-<something> &&
I wrote the following patch, which I've folded into my local copy (and
will send with v2):
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
index b9d82f9542..15072ecce3 100755
--- a/t/t6102-rev-list-unexpected-objects.sh
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -7,7 +7,8 @@ test_description='git rev-list should handle unexpected object types'
test_expect_success 'setup well-formed objects' '
blob="$(printf "foo" | git hash-object -w --stdin)" &&
tree="$(printf "100644 blob $blob\tfoo" | git mktree)" &&
- commit="$(git commit-tree $tree -m "first commit")"
+ commit="$(git commit-tree $tree -m "first commit")" &&
+ git cat-file commit $commit >good-commit
'
test_expect_success 'setup unexpected non-blob entry' '
@@ -37,8 +38,8 @@ test_expect_failure 'traverse unexpected non-tree entry (seen)' '
'
test_expect_success 'setup unexpected non-commit parent' '
- git cat-file commit $commit | \
- sed "/^author/ { h; s/.*/parent $blob/; G; }" >broken-commit &&
+ sed "/^author/ { h; s/.*/parent $blob/; G; }" <good-commit \
+ >broken-commit &&
broken_commit="$(git hash-object -w --literally -t commit \
broken-commit)"
'
@@ -55,8 +56,7 @@ test_expect_success 'traverse unexpected non-commit parent (seen)' '
'
test_expect_success 'setup unexpected non-tree root' '
- git cat-file commit $commit |
- sed -e "s/$tree/$blob/" >broken-commit &&
+ sed -e "s/$tree/$blob/" <good-commit >broken-commit &&
broken_commit="$(git hash-object -w --literally -t commit \
broken-commit)"
'
@@ -71,8 +71,9 @@ test_expect_failure 'traverse unexpected non-tree root (seen)' '
test_expect_success 'setup unexpected non-commit tag' '
git tag -a -m "tagged commit" tag $commit &&
+ git cat-file tag tag >good-tag &&
test_when_finished "git tag -d tag" &&
- git cat-file -p tag | sed -e "s/$commit/$blob/" >broken-tag &&
+ sed -e "s/$commit/$blob/" <good-tag >broken-tag &&
tag=$(git hash-object -w --literally -t tag broken-tag)
'
@@ -87,9 +88,9 @@ test_expect_success 'traverse unexpected non-commit tag (seen)' '
test_expect_success 'setup unexpected non-tree tag' '
git tag -a -m "tagged tree" tag $tree &&
+ git cat-file tag tag >good-tag &&
test_when_finished "git tag -d tag" &&
- git cat-file -p tag |
- sed -e "s/$tree/$blob/" >broken-tag &&
+ sed -e "s/$tree/$blob/" <good-tag >broken-tag &&
tag=$(git hash-object -w --literally -t tag broken-tag)
'
@@ -104,9 +105,9 @@ test_expect_success 'traverse unexpected non-tree tag (seen)' '
test_expect_success 'setup unexpected non-blob tag' '
git tag -a -m "tagged blob" tag $blob &&
+ git cat-file tag tag >good-tag &&
test_when_finished "git tag -d tag" &&
- git cat-file -p tag |
- sed -e "s/$blob/$commit/" >broken-tag &&
+ sed -e "s/$blob/$commit/" <good-tag >broken-tag &&
tag=$(git hash-object -w --literally -t tag broken-tag)
'
> With all the recent work of moving away from having Git upstream of a
> pipe, let's not intentionally introduce a new instance. I wrote the
> example 'sed' expression that way merely to mirror how the original
> 'perl' version was written to make it easier to see the equivalence
> (not because it was intended as an endorsement of having Git upstream
> of a pipe).
I see, and thank you for the clarification. Let me know if you like the
patch above.
Thanks,
Taylor
next prev parent reply other threads:[~2019-04-09 5:09 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 [this message]
2019-04-09 8:02 ` Eric Sunshine
2019-04-10 1:54 ` Taylor Blau
2019-04-06 5:31 ` Taylor Blau
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=20190409050857.GI81620@Taylors-MBP.hsd1.wa.comcast.net \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--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).