aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2016-02-21 17:32:22 +0000
committerJunio C Hamano <gitster@pobox.com>2016-02-23 15:03:43 -0800
commit3b1442d5d23577ed3570023d338cd12298b16867 (patch)
treed17a21759f7f696512c43eff25f3a0f7f203d3c8
parent0be43dedbc03139b9d9d0bc71deefc4d7f47296d (diff)
downloadgit-3b1442d5d23577ed3570023d338cd12298b16867.tar.gz
git-3b1442d5d23577ed3570023d338cd12298b16867.tar.xz
t9200: avoid grep on non-ASCII data
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t9200-git-cvsexportcommit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index 812c9cd46..711771983 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