Merge branch 'jk/unused-params-even-more'

diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index f94854d447d600b3153a3c2f6b5e9a7b872d42ae..eaaae414a1ff22d127a51f047716800a8585d87a 100755 (executable)
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -546,7 +546,7 @@ test_expect_success 'submit --update-shelve' '
        )
 '
 
-test_expect_failure 'update a shelve involving moved and copied files' '
+test_expect_success 'update a shelve involving moved and copied files' '
        test_when_finished cleanup_git &&
        (
                cd "$cli" &&
@@ -593,8 +593,4 @@ test_expect_failure 'update a shelve involving moved and copied files' '
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
-'
-
 test_done