diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-16 23:27:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 23:27:49 (GMT) |
| commit | 97c138fe4e5762495310e47c7b9e65e8f07af2c2 (patch) | |
| tree | 47721c65ae4235d6f8306c2d39f98c40c388707c /t | |
| parent | c4a44e23e03c4a1558a21c15bb880c9411a37fd5 (diff) | |
| parent | b34fa5777d84abf123cd6b306e2a9a02dac4fc86 (diff) | |
| download | git-97c138fe4e5762495310e47c7b9e65e8f07af2c2.zip git-97c138fe4e5762495310e47c7b9e65e8f07af2c2.tar.gz git-97c138fe4e5762495310e47c7b9e65e8f07af2c2.tar.bz2 | |
Merge branch 'vk/p4-submit-shelve'
* vk/p4-submit-shelve:
git-p4: allow submit to create shelved changelists.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9807-git-p4-submit.sh | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 5931528..42a5fad 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -413,6 +413,37 @@ test_expect_success 'submit --prepare-p4-only' ' ) ' +test_expect_success 'submit --shelve' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$cli" && + p4 revert ... && + cd "$git" && + git config git-p4.skipSubmitEdit true && + test_commit "shelveme1" && + git p4 submit --origin=HEAD^ && + + echo 654321 >shelveme2.t && + echo 123456 >>shelveme1.t && + git add shelveme* && + git commit -m"shelvetest" && + git p4 submit --shelve --origin=HEAD^ && + + test_path_is_file shelveme1.t && + test_path_is_file shelveme2.t + ) && + ( + cd "$cli" && + change=$(p4 -G changes -s shelved -m 1 //depot/... | \ + marshal_dump change) && + p4 describe -S $change | grep shelveme2 && + p4 describe -S $change | grep 123456 && + test_path_is_file shelveme1.t && + test_path_is_missing shelveme2.t + ) +' + test_expect_success 'kill p4d' ' kill_p4d ' |