diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:24:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:24:18 -0700 |
| commit | 78ed88d80a8cc9e2388ebe7631d71253e1d55aab (patch) | |
| tree | 060b4e8f75accc932befb149c66bc8e4fa0bd6e5 /t/t3508-cherry-pick-many-commits.sh | |
| parent | c336bc104c47cc9c2f7caf6bce468fe00a8f6850 (diff) | |
| parent | a73e22e96350c9bcb5c0e31e0298ce67bec0a527 (diff) | |
| download | git-78ed88d80a8cc9e2388ebe7631d71253e1d55aab.tar.gz | |
Merge branch 'mz/cherry-pick-cmdline-order' into maint
* mz/cherry-pick-cmdline-order:
cherry-pick/revert: respect order of revisions to pick
demonstrate broken 'git cherry-pick three one two'
teach log --no-walk=unsorted, which avoids sorting
Diffstat (limited to 't/t3508-cherry-pick-many-commits.sh')
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 75f7ff4f2f..340afc760d 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -44,6 +44,21 @@ test_expect_success 'cherry-pick first..fourth works' ' check_head_differs_from fourth ' +test_expect_success 'cherry-pick three one two works' ' + git checkout -f first && + test_commit one && + test_commit two && + test_commit three && + git checkout -f master && + git reset --hard first && + git cherry-pick three one two && + git diff --quiet three && + git diff --quiet HEAD three && + test "$(git log --reverse --format=%s first..)" = "three +one +two" +' + test_expect_success 'output to keep user entertained during multi-pick' ' cat <<-\EOF >expected && [master OBJID] second |