Skip to content

Commit 176a66a

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9814d0a commit 176a66a

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

t/t0001-init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ test_expect_success MINGW '.git hidden' '
399399
mkdir newdir &&
400400
cd newdir &&
401401
git init &&
402-
is_hidden .git
402+
test_path_is_hidden .git
403403
) &&
404404
check_config newdir/.git false unset
405405
'

t/t5611-clone-config.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ test_expect_success MINGW 'clone -c core.hideDotFiles' '
9696
test_commit attributes .gitattributes "" &&
9797
rm -rf child &&
9898
git clone -c core.hideDotFiles=false . child &&
99-
! is_hidden child/.gitattributes &&
99+
! test_path_is_hidden child/.gitattributes &&
100100
rm -rf child &&
101101
git clone -c core.hideDotFiles=dotGitOnly . child &&
102-
! is_hidden child/.gitattributes &&
102+
! test_path_is_hidden child/.gitattributes &&
103103
rm -rf child &&
104104
git clone -c core.hideDotFiles=true . child &&
105-
is_hidden child/.gitattributes
105+
test_path_is_hidden child/.gitattributes
106106
'
107107

108108
test_done

t/test-lib-functions.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,8 +1544,11 @@ test_bitmap_traversal () {
15441544
rm -f "$1.normalized" "$2.normalized"
15451545
}
15461546

1547-
# Tests for the hidden file attribute on windows
1548-
is_hidden () {
1547+
# Tests for the hidden file attribute on Windows
1548+
test_path_is_hidden () {
1549+
test_have_prereq MINGW ||
1550+
BUG "test_path_is_hidden can only be used on Windows"
1551+
15491552
# Use the output of `attrib`, ignore the absolute path
15501553
case "$("$SYSTEMROOT"/system32/attrib "$1")" in *H*?:*) return 0;; esac
15511554
return 1

0 commit comments

Comments
 (0)