diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-26 13:37:23 -0800 |
| commit | 316336379cf7937c2ecf122c7197cfe5da6b2061 (patch) | |
| tree | 6ff5b954a4c96acc550ab96ecebe0ee60e03db9e /t/t9200-git-cvsexportcommit.sh | |
| parent | c1fa85ff8ceae0e882d19b1548de407994ee4180 (diff) | |
| parent | 3b1442d5d23577ed3570023d338cd12298b16867 (diff) | |
| download | git-316336379cf7937c2ecf122c7197cfe5da6b2061.tar.gz | |
Merge branch 'jk/grep-binary-workaround-in-test'
Recent versions of GNU grep are pickier when their input contains
arbitrary binary data, which some of our tests uses. Rewrite the
tests to sidestep the problem.
* jk/grep-binary-workaround-in-test:
t9200: avoid grep on non-ASCII data
t8005: avoid grep on non-ASCII data
Diffstat (limited to 't/t9200-git-cvsexportcommit.sh')
| -rwxr-xr-x | t/t9200-git-cvsexportcommit.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh index 5cfb9cfc52..bb879a527d 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 |