Merge branch 'rh/test-color-avoid-terminfo-in-original-home'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2015 21:17:55 +0000 (14:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jul 2015 21:17:55 +0000 (14:17 -0700)
An ancient test framework enhancement to allow color was not
entirely correct; this makes it work even when tput needs to read
from the ~/.terminfo under the user's real HOME directory.

* rh/test-color-avoid-terminfo-in-original-home:
test-lib.sh: fix color support when tput needs ~/.terminfo
Revert "test-lib.sh: do tests for color support after changing HOME"

1  2 
t/test-lib.sh
diff --cc t/test-lib.sh
Simple merge