diff options
| author | Pete Wyckoff <pw@padd.com> | 2014-01-21 18:16:41 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-22 08:05:26 -0800 |
| commit | 630c4f19f0d4f4c6a485af944d88665979fa0e1f (patch) | |
| tree | c9cd5c1cda7171803f4beba757cd676750e57f0d | |
| parent | 40f846c35c504a1c2303be5dcca6db069a17b856 (diff) | |
| download | git-630c4f19f0d4f4c6a485af944d88665979fa0e1f.tar.gz git-630c4f19f0d4f4c6a485af944d88665979fa0e1f.tar.xz | |
git p4 test: explicitly check p4 wildcard delete
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>
| -rwxr-xr-x | t/t9812-git-p4-wildcards.sh | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/t/t9812-git-p4-wildcards.sh b/t/t9812-git-p4-wildcards.sh index 67633257f..f2ddbc50e 100755 --- a/t/t9812-git-p4-wildcards.sh +++ b/t/t9812-git-p4-wildcards.sh @@ -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 ' |