Merge branch 'mg/work-tree-tests'

diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh
index 78f1d0f92d9e55641a225bc0cefca69822e17f47..d808c008c11700badffdcbbd34faba39428a47f1 100755 (executable)
--- a/t/t9819-git-p4-case-folding.sh
+++ b/t/t9819-git-p4-case-folding.sh
@@ -4,6 +4,12 @@ test_description='interaction with P4 case-folding'
 
 . ./lib-git-p4.sh
 
+if test_have_prereq CASE_INSENSITIVE_FS
+then
+       skip_all='skipping P4 case-folding tests; case insensitive file system detected'
+       test_done
+fi
+
 test_expect_success 'start p4d with case folding enabled' '
        start_p4d -C1
 '