From: John Keeping <john@keeping.me.uk>
To: git@vger.kernel.org
Cc: John Keeping <john@keeping.me.uk>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH 2/2] t9200: avoid grep on non-ASCII data
Date: Sun, 21 Feb 2016 17:32:22 +0000 [thread overview]
Message-ID: <42c95c23bffcbb526aaae302f80667867d164876.1456075680.git.john@keeping.me.uk> (raw)
In-Reply-To: <cover.1456075680.git.john@keeping.me.uk>
In-Reply-To: <cover.1456075680.git.john@keeping.me.uk>
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>
---
t/t9200-git-cvsexportcommit.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index 812c9cd..0765d52 100755
--- 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
if test -z "$2"
then
>expected
--
2.7.1.503.g3cfa3ac
next prev parent reply other threads:[~2016-02-21 17:33 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 ` John Keeping [this message]
2016-02-21 21:15 ` [PATCH 2/2] t9200: " Eric Sunshine
2016-02-21 23:43 ` John Keeping
2016-02-22 0:04 ` Eric Sunshine
2016-02-22 22:25 ` Jeff King
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=42c95c23bffcbb526aaae302f80667867d164876.1456075680.git.john@keeping.me.uk \
--to=john@keeping.me.uk \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--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).