Merge branch 'di/readme-markup-fix'

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 527508c350e2b157719fd509dce0f5111616ef4c..27b81276fc22569249bb5e83dcf4ba95e9823a57 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -309,7 +309,7 @@ test_unset_prereq () {
 }
 
 test_set_prereq () {
-       if test -n "$GIT_TEST_FAIL_PREREQS"
+       if test -n "$GIT_TEST_FAIL_PREREQS_INTERNAL"
        then
                case "$1" in
                # The "!" case is handled below with
@@ -908,6 +908,21 @@ test_cmp_rev () {
        fi
 }
 
+# Compare paths respecting core.ignoreCase
+test_cmp_fspath () {
+       if test "x$1" = "x$2"
+       then
+               return 0
+       fi
+
+       if test true != "$(git config --get --type=bool core.ignorecase)"
+       then
+               return 1
+       fi
+
+       test "x$(echo "$1" | tr A-Z a-z)" =  "x$(echo "$2" | tr A-Z a-z)"
+}
+
 # Print a sequence of integers in increasing order, either with
 # two arguments (start and end):
 #
@@ -1043,7 +1058,7 @@ perl () {
 # The error/skip message should be given by $2.
 #
 test_skip_or_die () {
-       if ! git env--helper --mode-bool --variable=$1 --default=0 --exit-code --quiet
+       if ! git env--helper --type=bool --default=false --exit-code $1
        then
                skip_all=$2
                test_done