Merge branch 'aj/xfuncname-ada'

[git.git] / t / t3300-funny-names.sh

diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index 1f35e55ee3be1b2bbdb8aa9f3248f6fe5ebf46cb..7480d6e7c2a8d14c5f75875d47eefe96ca9c5010 100755 (executable)
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -11,6 +11,16 @@ tree, index, and tree objects.
 
 . ./test-lib.sh
 
+HT='   '
+
+echo 2>/dev/null > "Name with an${HT}HT"
+if ! test -f "Name with an${HT}HT"
+then
+       # since FAT/NTFS does not allow tabs in filenames, skip this test
+       skip_all='Your filesystem does not allow tabs in filenames'
+       test_done
+fi
+
 p0='no-funny'
 p1='tabs       ," (dq) and spaces'
 p2='just space'
@@ -23,21 +33,9 @@ test_expect_success 'setup' '
        EOF
 
        { cat "$p0" >"$p1" || :; } &&
-       { echo "Foo Bar Baz" >"$p2" || :; } &&
-
-       if test -f "$p1" && cmp "$p0" "$p1"
-       then
-               test_set_prereq TABS_IN_FILENAMES
-       fi
+       { echo "Foo Bar Baz" >"$p2" || :; }
 '
 
-if ! test_have_prereq TABS_IN_FILENAMES
-then
-       # since FAT/NTFS does not allow tabs in filenames, skip this test
-       skip_all='Your filesystem does not allow tabs in filenames'
-       test_done
-fi
-
 test_expect_success 'setup: populate index and tree' '
        git update-index --add "$p0" "$p2" &&
        t0=$(git write-tree)