Merge branch 'ab/cond-skip-tests' into maint

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 86d77c16dd3abcedd3fd4937a73b142a6b83b7b6..23c29bce6edbb5b921145e80849600896c2e1e3f 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -342,6 +342,7 @@ fi
 
 exec 5>&1
 exec 6<&0
+exec 7>&2
 if test "$verbose_log" = "t"
 then
        exec 3>>"$GIT_TEST_TEE_OUTPUT_FILE" 4>&3