summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-03-27 06:22:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-27 14:56:57 (GMT)
commitb1d645b58ac6c96ffdc8d9a01f0b44a10deb43f9 (patch)
treeb5e78d6f3c6fcc0fd00acf8e588d75b6a3e34dfc
parentfae9d761c78cba1039854b51df6c2f7360e59cba (diff)
downloadgit-b1d645b58ac6c96ffdc8d9a01f0b44a10deb43f9.zip
git-b1d645b58ac6c96ffdc8d9a01f0b44a10deb43f9.tar.gz
git-b1d645b58ac6c96ffdc8d9a01f0b44a10deb43f9.tar.bz2
tests: unset COLUMNS inherited from environment
$COLUMNS must be unset to not interfere with the tests. The tests already ignore the terminal size because output is redirected to a file, but COLUMNS overrides terminal size detection and changes the test output away from the standard 80. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/test-lib.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 30ed4d7..b7d7100 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -46,7 +46,7 @@ EDITOR=:
# /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 '
+unset VISUAL EMAIL LANGUAGE COLUMNS $(perl -e '
my @env = keys %ENV;
my $ok = join("|", qw(
TRACE