Browse Source

demonstrate broken 'git cherry-pick three one two'

Cherry-picking commits out of order (w.r.t. commit time stamp) doesn't
currently work. Add a test case to demonstrate it.

Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Martin von Zweigbergk 13 years ago committed by Junio C Hamano
parent
commit
d023c248a3
  1. 15
      t/t3508-cherry-pick-many-commits.sh

15
t/t3508-cherry-pick-many-commits.sh

@ -44,6 +44,21 @@ test_expect_success 'cherry-pick first..fourth works' ' @@ -44,6 +44,21 @@ test_expect_success 'cherry-pick first..fourth works' '
check_head_differs_from fourth
'

test_expect_failure '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

Loading…
Cancel
Save