[PATCH v2] tests: unset COLUMNS inherited from environment

From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mar 27, 2012, 06:22 UTC
Message-ID: <1332829323-6048-1-git-send-email-zbyszek@in.waw.pl>
In-Reply-To: <20120327051714.GB20897@sigill.intra.peff.net>

$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>
---
Right, it is better to unset $COLUMNS globally. t4016 was also affected.

 t/test-lib.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

-- 
1.7.10.rc1.222.gc0040.dirty