[PATCHv2 04/11] git p4 test: explicitly check p4 wildcard delete
- From
- Pete Wyckoff <pw@padd.com>
- Date
- Jan 22, 2014, 22:47 UTC
- Message-ID
- <1390430849-11436-4-git-send-email-pw@padd.com>
- In-Reply-To
- <20140122224421.GB4047@padd.com>
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> --- t/t9812-git-p4-wildcards.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
diff --git a/t/t9812-git-p4-wildcards.sh b/t/t9812-git-p4-wildcards.sh index 6763325..f2ddbc5 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 '
-- 1.8.5.2.364.g6ac45cd