Merge branch 'mk/blame-first-parent'

diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
index 4cff6a760fc27b4f4f87c5f0387e34b3039e5518..37b42d03a2b4f6392c3b84303c52a839caa6befd 100755 (executable)
--- a/t/t9815-git-p4-submit-fail.sh
+++ b/t/t9815-git-p4-submit-fail.sh
@@ -417,11 +417,8 @@ test_expect_success 'cleanup chmod after submit cancel' '
                ! p4 fstat -T action text &&
                test_path_is_file text+x &&
                ! p4 fstat -T action text+x &&
-               if test_have_prereq !CYGWIN
-               then
-                       stat --format=%A text | egrep ^-r-- &&
-                       stat --format=%A text+x | egrep ^-r-x
-               fi
+               ls -l text | egrep ^-r-- &&
+               ls -l text+x | egrep ^-r-x
        )
 '