diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-05 13:28:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-05 13:28:10 -0800 |
| commit | a778ba1c71eca2e7f9978bd529efa3f2d393710d (patch) | |
| tree | 1a24041dd72d21cfb1621b97724e8646ef3eb219 /t | |
| parent | a741e2825b3a3045254f404696c0051714c0e7c3 (diff) | |
| parent | 8cf422dbf1b4bc14a970b7ff5c5fa555f61dd9ed (diff) | |
| download | git-a778ba1c71eca2e7f9978bd529efa3f2d393710d.tar.gz git-a778ba1c71eca2e7f9978bd529efa3f2d393710d.tar.xz | |
Merge branch 'ld/p4-multiple-shelves'
"git p4" update.
* ld/p4-multiple-shelves:
git-p4: update multiple shelved change lists
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9807-git-p4-submit.sh | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 3457d5db6..71cae2874 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -460,7 +460,13 @@ test_expect_success 'submit --shelve' ' ) ' -# Update an existing shelved changelist +make_shelved_cl() { + test_commit "$1" >/dev/null && + git p4 submit --origin HEAD^ --shelve >/dev/null && + p4 -G changes -s shelved -m 1 | marshal_dump change +} + +# Update existing shelved changelists test_expect_success 'submit --update-shelve' ' test_when_finished cleanup_git && @@ -470,21 +476,19 @@ test_expect_success 'submit --update-shelve' ' p4 revert ... && cd "$git" && git config git-p4.skipSubmitEdit true && - test_commit "test-update-shelved-change" && - git p4 submit --origin=HEAD^ --shelve && + shelved_cl0=$(make_shelved_cl "shelved-change-0") && + echo shelved_cl0=$shelved_cl0 && + shelved_cl1=$(make_shelved_cl "shelved-change-1") && - shelf_cl=$(p4 -G changes -s shelved -m 1 |\ - marshal_dump change) && - test -n $shelf_cl && - echo "updating shelved change list $shelf_cl" && + echo "updating shelved change lists $shelved_cl0 and $shelved_cl1" && echo "updated-line" >>shelf.t && echo added-file.t >added-file.t && git add shelf.t added-file.t && - git rm -f test-update-shelved-change.t && + git rm -f shelved-change-1.t && git commit --amend -C HEAD && git show --stat HEAD && - git p4 submit -v --origin HEAD^ --update-shelve $shelf_cl && + git p4 submit -v --origin HEAD~2 --update-shelve $shelved_cl0 --update-shelve $shelved_cl1 && echo "done git p4 submit" ) && ( @@ -494,7 +498,7 @@ test_expect_success 'submit --update-shelve' ' p4 unshelve -c $change -s $change && grep -q updated-line shelf.t && p4 describe -S $change | grep added-file.t && - test_path_is_missing test-update-shelved-change.t + test_path_is_missing shelved-change-1.t ) ' |