diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-05 06:21:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-05 06:21:52 (GMT) |
| commit | 91527e54d565e6fb6910fb3cb22f5915b5bd346e (patch) | |
| tree | d86ee11ed880f6776cc192cbd1fec25e77064e22 /t/test-lib.sh | |
| parent | 38916c5b4740f6db09dc140a84bb470dfb582366 (diff) | |
| parent | ead8eb8c1092ce2d94d70872946829a7a946ae9d (diff) | |
| download | git-91527e54d565e6fb6910fb3cb22f5915b5bd346e.zip git-91527e54d565e6fb6910fb3cb22f5915b5bd346e.tar.gz git-91527e54d565e6fb6910fb3cb22f5915b5bd346e.tar.bz2 | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.9.3 for the last time
http.proxy: also mention https_proxy and all_proxy
t0300: work around bug in dash 0.5.6
t5512 (ls-remote): modernize style
tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index d75766a..30ed4d7 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -42,10 +42,11 @@ TZ=UTC TERM=dumb export LANG LC_ALL PAGER TERM TZ EDITOR=: -unset VISUAL -unset EMAIL -unset LANGUAGE -unset $(perl -e ' +# A call to "unset" with no arguments causes at least Solaris 10 +# /usr/xpg4/bin/sh and /bin/ksh to bail out. So keep the unsets +# deriving from the command substitution clustered with the other +# ones. +unset VISUAL EMAIL LANGUAGE $(perl -e ' my @env = keys %ENV; my $ok = join("|", qw( TRACE |