git p4 test: explicitly check p4 wildcard delete
authorPete Wyckoff <pw@padd.com>
Tue, 21 Jan 2014 23:16:41 +0000 (18:16 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jan 2014 16:05:26 +0000 (08:05 -0800)
There was no test where p4 deleted a file with a wildcard
character. Make sure git p4 applies the wildcard decoding
properly when importing a delete that includes a wildcard.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9812-git-p4-wildcards.sh
index 67633257f3fccb2408d678759bce87f7a58acd0a..f2ddbc50e7c2ecd198a7f76301101be5ce7de7a6 100755 (executable)
@@ -161,6 +161,33 @@ test_expect_success 'wildcard files submit back to p4, delete' '
        )
 '
 
+test_expect_success 'p4 deleted a wildcard file' '
+       (
+               cd "$cli" &&
+               echo "wild delete test" >wild@delete &&
+               p4 add -f wild@delete &&
+               p4 submit -d "add wild@delete"
+       ) &&
+       test_when_finished cleanup_git &&
+       git p4 clone --dest="$git" //depot &&
+       (
+               cd "$git" &&
+               test_path_is_file wild@delete
+       ) &&
+       (
+               cd "$cli" &&
+               # must use its encoded name
+               p4 delete wild%40delete &&
+               p4 submit -d "delete wild@delete"
+       ) &&
+       (
+               cd "$git" &&
+               git p4 sync &&
+               git merge --ff-only p4/master &&
+               test_path_is_missing wild@delete
+       )
+'
+
 test_expect_success 'kill p4d' '
        kill_p4d
 '