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

diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh
index 7b83e696a92a5c97e8c022af2601d60a95ab1cbc..1bf7635016f54385912e7bd830eada93810a4bfc 100755 (executable)
--- a/t/t9822-git-p4-path-encoding.sh
+++ b/t/t9822-git-p4-path-encoding.sh
@@ -51,8 +51,20 @@ test_expect_success 'Clone repo containing iso8859-1 encoded paths with git-p4.p
        )
 '
 
-test_expect_success 'kill p4d' '
-       kill_p4d
+test_expect_success 'Delete iso8859-1 encoded paths and clone' '
+       (
+               cd "$cli" &&
+               ISO8859="$(printf "$ISO8859_ESCAPED")" &&
+               p4 delete "$ISO8859" &&
+               p4 submit -d "remove file"
+       ) &&
+       git p4 clone --destination="$git" //depot@all &&
+       test_when_finished cleanup_git &&
+       (
+               cd "$git" &&
+               git -c core.quotepath=false ls-files >actual &&
+               test_must_be_empty actual
+       )
 '
 
 test_done