mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
40f846c35c
commit
630c4f19f0
|
@ -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
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue