t: restrict `is_hidden` to be called only on Windows

The function won't work anywhere else, so let's mark it as an explicit
bug if it is called on a non-Windows platform.

Let's also rename the function to avoid cluttering the global namespace
with an overly-generic function name.

While at it, we also fix the code comment above that function: the
lower-case `windows` refers to something different than `Windows`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 9cc919d8d1a1bd1f918a3318652e8798e274fd81..1edd5aeb8f01d490b1cceba2c1d67df181868280 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -399,7 +399,7 @@ test_expect_success MINGW '.git hidden' '
                mkdir newdir &&
                cd newdir &&
                git init &&
-               is_hidden .git
+               test_path_is_hidden .git
        ) &&
        check_config newdir/.git false unset
 '

diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index c861e12ea4408488924257db53cb0d46f79d0873..8e0fd398236b5fd503565db7c2e266aef744476a 100755 (executable)
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -96,13 +96,13 @@ test_expect_success MINGW 'clone -c core.hideDotFiles' '
        test_commit attributes .gitattributes "" &&
        rm -rf child &&
        git clone -c core.hideDotFiles=false . child &&
-       ! is_hidden child/.gitattributes &&
+       ! test_path_is_hidden child/.gitattributes &&
        rm -rf child &&
        git clone -c core.hideDotFiles=dotGitOnly . child &&
-       ! is_hidden child/.gitattributes &&
+       ! test_path_is_hidden child/.gitattributes &&
        rm -rf child &&
        git clone -c core.hideDotFiles=true . child &&
-       is_hidden child/.gitattributes
+       test_path_is_hidden child/.gitattributes
 '
 
 test_done

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 2f81463a2409cc35dfcf28b679b62fe094a8dff3..139647a6341b04505801b1323464f61bfbeb194f 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1544,8 +1544,11 @@ test_bitmap_traversal () {
        rm -f "$1.normalized" "$2.normalized"
 }
 
-# Tests for the hidden file attribute on windows
-is_hidden () {
+# Tests for the hidden file attribute on Windows
+test_path_is_hidden () {
+       test_have_prereq MINGW ||
+       BUG "test_path_is_hidden can only be used on Windows"
+
        # Use the output of `attrib`, ignore the absolute path
        case "$("$SYSTEMROOT"/system32/attrib "$1")" in *H*?:*) return 0;; esac
        return 1