t2200, t7004: Avoid glob pattern that also matches files

diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index c5360e23d9ff1a5f31d42919eabdb2561f0d2e3d..a449580c8a2e41c665e1f29c56877e271fd17fef 100755 (executable)
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -8,6 +8,7 @@ auml=`printf '\xc3\xa4'`
 aumlcdiar=`printf '\x61\xcc\x88'`
 
 case_insensitive=
+unibad=
 test_expect_success 'see if we expect ' '
 
        test_case=test_expect_success
@@ -19,7 +20,6 @@ test_expect_success 'see if we expect ' '
        then
                test_case=test_expect_failure
                case_insensitive=t
-               say "will test on a case insensitive filesystem"
        fi &&
        rm -fr junk &&
        mkdir junk &&
@@ -27,13 +27,18 @@ test_expect_success 'see if we expect ' '
        case "$(cd junk && echo *)" in
        "$aumlcdiar")
                test_unicode=test_expect_failure
-               say "will test on a unicode corrupting filesystem"
+               unibad=t
                ;;
        *)      ;;
        esac &&
        rm -fr junk
 '
 
+test "$case_insensitive" &&
+       say "will test on a case insensitive filesystem"
+test "$unibad" &&
+       say "will test on a unicode corrupting filesystem"
+
 if test "$case_insensitive"
 then
 test_expect_success "detection of case insensitive filesystem during repo init" '
@@ -43,7 +48,7 @@ test_expect_success "detection of case insensitive filesystem during repo init"
 else
 test_expect_success "detection of case insensitive filesystem during repo init" '
 
-       ! git config --bool core.ignorecase >/dev/null ||
+       test_must_fail git config --bool core.ignorecase >/dev/null ||
        test $(git config --bool core.ignorecase) = false
 '
 fi
@@ -85,7 +90,7 @@ $test_case 'add (with different case)' '
        rm camelcase &&
        echo 1 >CamelCase &&
        git add CamelCase &&
-       test $(git-ls-files | grep -i camelcase | wc -l) = 1
+       test $(git ls-files | grep -i camelcase | wc -l) = 1
 
 '