Merge branch 'jk/difftool-no-overwrite-on-copyback'

diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index 0ae048f29f548eac6cfa37fbabcd9b7f80440515..1fb7bc7cf98bdbdf89491c687e6347cda673d720 100755 (executable)
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -17,6 +17,16 @@ test_expect_success 'init depot' '
        )
 '
 
+test_expect_failure 'is_cli_file_writeable function' '
+       (
+               cd "$cli" &&
+               echo a >a &&
+               is_cli_file_writeable a &&
+               ! is_cli_file_writeable file1 &&
+               rm a
+       )
+'
+
 test_expect_success 'submit with no client dir' '
        test_when_finished cleanup_git &&
        git p4 clone --dest="$git" //depot &&
@@ -200,7 +210,7 @@ test_expect_success 'submit copy' '
        (
                cd "$cli" &&
                test_path_is_file file5.ta &&
-               test ! -w file5.ta
+               ! is_cli_file_writeable file5.ta
        )
 '
 
@@ -219,7 +229,7 @@ test_expect_success 'submit rename' '
                cd "$cli" &&
                test_path_is_missing file6.t &&
                test_path_is_file file6.ta &&
-               test ! -w file6.ta
+               ! is_cli_file_writeable file6.ta
        )
 '