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/lib-gettext.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/lib-gettext.sh')
| -rw-r--r-- | t/lib-gettext.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh index 0f76f6cdc0..ae8883a075 100644 --- a/t/lib-gettext.sh +++ b/t/lib-gettext.sh @@ -14,12 +14,14 @@ export GIT_TEXTDOMAINDIR GIT_PO_PATH if test_have_prereq GETTEXT && ! test_have_prereq GETTEXT_POISON then # is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian - is_IS_locale=$(locale -a | sed -n '/^is_IS\.[uU][tT][fF]-*8$/{ + is_IS_locale=$(locale -a 2>/dev/null | + sed -n '/^is_IS\.[uU][tT][fF]-*8$/{ p q }') # is_IS.ISO8859-1 on Solaris and FreeBSD, is_IS.iso88591 on Debian - is_IS_iso_locale=$(locale -a | sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{ + is_IS_iso_locale=$(locale -a 2>/dev/null | + sed -n '/^is_IS\.[iI][sS][oO]8859-*1$/{ p q }') |