diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-27 09:28:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-27 09:28:00 -0700 |
| commit | d4958d30f851a70905b291ee9b996232e8db48e2 (patch) | |
| tree | 6841915fbda58359d33476cc198e4f3eb4d2089a | |
| parent | 678c5741118729dc9072182bd368e0a3402dd4f1 (diff) | |
| parent | b082687cbac951d31bdea346404db5d0b99a0b73 (diff) | |
| download | git-d4958d30f851a70905b291ee9b996232e8db48e2.tar.gz git-d4958d30f851a70905b291ee9b996232e8db48e2.tar.xz | |
Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph
By Zbigniew Jędrzejewski-Szmek
* zj/mksh-columns-breakage:
test-lib: skip test with COLUMNS=1 under mksh
| -rw-r--r-- | t/test-lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index b7d7100c4..9e2b71132 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -615,6 +615,7 @@ case $(uname -s) in ;; esac +( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 test -z "$NO_PERL" && test_set_prereq PERL test -z "$NO_PYTHON" && test_set_prereq PYTHON test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE |