Imported Upstream version 2.11.4

[platform/upstream/git.git] / t / t0050-filesystem.sh

diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 05d78d2..b29d749 100755 (executable)
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -33,16 +33,20 @@ test_expect_success "detection of case insensitive filesystem during repo init"
 '
 else
 test_expect_success "detection of case insensitive filesystem during repo init" '
-       test_must_fail git config --bool core.ignorecase >/dev/null ||
-       test $(git config --bool core.ignorecase) = false
+       {
+               test_must_fail git config --bool core.ignorecase >/dev/null ||
+                       test $(git config --bool core.ignorecase) = false
+       }
 '
 fi
 
 if test_have_prereq SYMLINKS
 then
 test_expect_success "detection of filesystem w/o symlink support during repo init" '
-       test_must_fail git config --bool core.symlinks ||
-       test "$(git config --bool core.symlinks)" = true
+       {
+               test_must_fail git config --bool core.symlinks ||
+               test "$(git config --bool core.symlinks)" = true
+       }
 '
 else
 test_expect_success "detection of filesystem w/o symlink support during repo init" '
@@ -64,7 +68,7 @@ test_expect_success "setup case tests" '
        git checkout -f master
 '
 
-$test_case 'rename (case change)' '
+test_expect_success 'rename (case change)' '
        git mv camelcase CamelCase &&
        git commit -m "rename"
 '
@@ -91,6 +95,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 &&