pull: support pull.ff config

diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh
index e71e54334314ba46fbb75a46f57a6b49216382ad..d048bd33fa3c94402eb750b65553f72b955aa25f 100755 (executable)
--- a/t/t9816-git-p4-locked.sh
+++ b/t/t9816-git-p4-locked.sh
@@ -35,13 +35,13 @@ test_expect_success 'edit with lock not taken' '
        )
 '
 
-test_expect_failure 'add with lock not taken' '
+test_expect_success 'add with lock not taken' '
        test_when_finished cleanup_git &&
        git p4 clone --dest="$git" //depot &&
        (
                cd "$git" &&
                echo line1 >>add-lock-not-taken &&
-               git add file2 &&
+               git add add-lock-not-taken &&
                git commit -m "add add-lock-not-taken" &&
                git config git-p4.skipSubmitEdit true &&
                git p4 submit --verbose
@@ -107,7 +107,7 @@ test_expect_failure 'chmod with lock taken' '
        )
 '
 
-test_expect_failure 'copy with lock taken' '
+test_expect_success 'copy with lock taken' '
        lock_in_another_client &&
        test_when_finished cleanup_git &&
        test_when_finished "cd \"$cli\" && p4 revert file2 && rm -f file2" &&
@@ -130,8 +130,8 @@ test_expect_failure 'move with lock taken' '
        git p4 clone --dest="$git" //depot &&
        (
                cd "$git" &&
-               git mv file1 file2 &&
-               git commit -m "mv file1 to file2" &&
+               git mv file1 file3 &&
+               git commit -m "mv file1 to file3" &&
                git config git-p4.skipSubmitEdit true &&
                git config git-p4.detectRenames true &&
                git p4 submit --verbose