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>
Martin von Zweigbergk committed
Aug 28, 2012 at 23:15 UTC
d023c248a39a7ac3ee226e34eadcee6913913f2f
1 file changed
+15
t/t3508-cherry-pick-many-commits.sh
+15
@@ -44,6 +44,21 @@ test_expect_success 'cherry-pick first..fourth works' '
44
check_head_differs_from fourth
45
'
46
47
+test_expect_failure 'cherry-pick three one two works' '
48
+ git checkout -f first &&
49
+ test_commit one &&
50
+ test_commit two &&
51
+ test_commit three &&
52
+ git checkout -f master &&
53
+ git reset --hard first &&
54
+ git cherry-pick three one two &&
55
+ git diff --quiet three &&
56
+ git diff --quiet HEAD three &&
57
+ test "$(git log --reverse --format=%s first..)" = "three
58
+one
59
+two"
60
+'
61
+
62
test_expect_success 'output to keep user entertained during multi-pick' '
63
cat <<-\EOF >expected &&
64
[master OBJID] second