Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5

diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 05d78d22a6d0fa5534ae3f37cb3c289595b6c1c5..6b3cedcf24613b9c72c67b02c0b731db67055a26 100755 (executable)
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -91,6 +91,7 @@ test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' '
 test_expect_success "setup unicode normalization tests" '
        test_create_repo unicode &&
        cd unicode &&
+       git config core.precomposeunicode false &&
        touch "$aumlcdiar" &&
        git add "$aumlcdiar" &&
        git commit -m initial &&