diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-08 11:16:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-08 11:16:52 -0800 |
| commit | ee18de62b5ca1b94ac72799d38eb07cbb1e8d9f4 (patch) | |
| tree | ccd5553f24339aff24d7014fc814de5e35b5c99a /t/t9502-gitweb-standalone-parse-output.sh | |
| parent | 831d57a0f52c4c1bb8b9561a82b3006474595c84 (diff) | |
| parent | 27f6342f615a4e3fc4dcab5cef2b6bc9ca574ce6 (diff) | |
Merge branch 'jc/maint-test-portability' into maint
* jc/maint-test-portability:
t4014: fix arguments to grep
t9502: do not assume GNU tar
t0200: "locale" may not exist
Diffstat (limited to 't/t9502-gitweb-standalone-parse-output.sh')
| -rwxr-xr-x | t/t9502-gitweb-standalone-parse-output.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh index 3a8e7d3f5a..86dfee2e4f 100755 --- a/t/t9502-gitweb-standalone-parse-output.sh +++ b/t/t9502-gitweb-standalone-parse-output.sh @@ -40,7 +40,7 @@ check_snapshot () { echo "basename=$basename" grep "filename=.*$basename.tar" gitweb.headers >/dev/null 2>&1 && "$TAR" tf gitweb.body >file_list && - ! grep -v "^$prefix/" file_list + ! grep -v -e "^$prefix$" -e "^$prefix/" -e "^pax_global_header$" file_list } test_expect_success setup ' |