Merge branch 'jk/diff-graph-cleanup'

diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index 0b58fb96f097dee7cd4d139269698e8dde4a81c3..77f63492d90e61500e6665ba447fbbad7a8c7b3b 100755 (executable)
--- a/t/t9809-git-p4-client-view.sh
+++ b/t/t9809-git-p4-client-view.sh
@@ -333,7 +333,7 @@ test_expect_success 'subdir clone, submit copy' '
        (
                cd "$cli" &&
                test_path_is_file dir1/file11a &&
-               test ! -w dir1/file11a
+               ! is_cli_file_writeable dir1/file11a
        )
 '
 
@@ -353,7 +353,7 @@ test_expect_success 'subdir clone, submit rename' '
                cd "$cli" &&
                test_path_is_missing dir1/file13 &&
                test_path_is_file dir1/file13a &&
-               test ! -w dir1/file13a
+               ! is_cli_file_writeable dir1/file13a
        )
 '
 
@@ -365,7 +365,10 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
        (
                cd "$git" &&
                echo git-wild-hash >dir1/git-wild#hash &&
-               echo git-wild-star >dir1/git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       echo git-wild-star >dir1/git-wild\*star
+               fi &&
                echo git-wild-at >dir1/git-wild@at &&
                echo git-wild-percent >dir1/git-wild%percent &&
                git add dir1/git-wild* &&
@@ -376,7 +379,10 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' '
        (
                cd "$cli" &&
                test_path_is_file dir1/git-wild#hash &&
-               test_path_is_file dir1/git-wild\*star &&
+               if test_have_prereq NOT_MINGW NOT_CYGWIN
+               then
+                       test_path_is_file dir1/git-wild\*star
+               fi &&
                test_path_is_file dir1/git-wild@at &&
                test_path_is_file dir1/git-wild%percent
        ) &&