From: Jeff King <peff@peff.net>
To: John Keeping <john@keeping.me.uk>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/2] t9200: avoid grep on non-ASCII data
Date: Mon, 22 Feb 2016 17:25:04 -0500 [thread overview]
Message-ID: <20160222222503.GD18522@sigill.intra.peff.net> (raw)
In-Reply-To: <20160221234345.GB14382@river.lan>
On Sun, Feb 21, 2016 at 11:43:45PM +0000, John Keeping wrote:
> On Sun, Feb 21, 2016 at 04:15:31PM -0500, Eric Sunshine wrote:
> > On Sun, Feb 21, 2016 at 12:32 PM, John Keeping <john@keeping.me.uk> wrote:
> > > GNU grep 2.23 detects the input used in this test as binary data so it
> > > does not work for extracting lines from a file. We could add the "-a"
> > > option to force grep to treat the input as text, but not all
> > > implementations support that. Instead, use sed to extract the desired
> > > lines since it will always treat its input as text.
> > >
> > > Signed-off-by: John Keeping <john@keeping.me.uk>
> > > ---
> > > diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
> > > @@ -35,7 +35,7 @@ exit 1
> > > check_entries () {
> > > # $1 == directory, $2 == expected
> > > - grep '^/' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
> > > + sed -ne '\!^/!p' "$1/CVS/Entries" | sort | cut -d/ -f2,3,5 >actual
> >
> > This works with BSD sed, but double negatives are confusing. Have you
> > considered this instead?
> >
> > sed -ne '/^\//p' ...
>
> What do you mean double negatives? Do you mean using "!" as an
> alternative delimiter? I find changing delimters is normally simpler
> than following multiple levels of quoting for escaping slashes, although
> in this case it's simple enough that it doesn't make much difference.
I agree that changing delimiters is much nicer than backslashes. But I
wonder if using "!" is more confusing than it needs to be, given its
other meanings.
I dunno. I admit that the backslash threw me off, too (since it needs
escaped in interactive shells, I first assumed that's what was going
on). Using backslash to select the delimiter was new to me. I've usually
seen:
s!/foo/!/bar/!
which is arguably a little more clear. Too bad we cannot do:
m!/foo!
which I think reads better. Oh well. Maybe:
sed -ne '\#^/#p'
would be more readable, but I'm just bikeshedding at this point. The
grep invocation really was the most clear. :-/
-Peff
next prev parent reply other threads:[~2016-02-22 22:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-07 16:25 Test failures with GNU grep 2.23 John Keeping
2016-02-19 11:59 ` Jeff King
2016-02-19 17:27 ` Eric Sunshine
2016-02-19 17:38 ` Junio C Hamano
2016-02-19 19:11 ` Jeff King
2016-02-19 19:23 ` John Keeping
2016-02-19 19:33 ` Jeff King
2016-02-21 17:32 ` [PATCH 0/2] Fix test " John Keeping
2016-02-21 17:32 ` [PATCH 1/2] t8005: avoid grep on non-ASCII data John Keeping
2016-02-21 21:01 ` Eric Sunshine
2016-02-21 23:19 ` Jeff King
2016-02-21 23:31 ` Eric Sunshine
2016-02-21 23:35 ` Jeff King
2016-02-21 23:41 ` John Keeping
2016-02-21 23:50 ` Eric Sunshine
2016-02-22 22:18 ` Jeff King
2016-02-22 22:25 ` Junio C Hamano
2016-02-23 23:01 ` Junio C Hamano
2016-02-24 10:24 ` John Keeping
2016-02-21 23:31 ` Junio C Hamano
2016-02-21 23:40 ` Eric Sunshine
2016-02-21 17:32 ` [PATCH 2/2] t9200: " John Keeping
2016-02-21 21:15 ` Eric Sunshine
2016-02-21 23:43 ` John Keeping
2016-02-22 0:04 ` Eric Sunshine
2016-02-22 22:25 ` Jeff King [this message]
2016-02-23 22:55 ` 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=20160222222503.GD18522@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=sunshine@sunshineco.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.
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 NNTP newsgroup(s).