{"thread":{"id":"24227","subject":"[PATCH] Update t3508 status","startedAt":"2010-06-29T01:31:31Z","lastAt":"2010-06-29T17:22:24Z","messageCount":5,"participants":["newren@gmail.com","Junio C Hamano","Jonathan Nieder","Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"144436","messageId":"1277775091-13313-1-git-send-email-newren@gmail.com","threadId":"24227","inReplyTo":null,"subject":"[PATCH] Update t3508 status","fromName":"","fromEmail":"newren@gmail.com","sentAt":"2010-06-29T01:31:31Z","receivedAt":"2010-06-29T01:31:31Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\nTest #8 of t3508-cherry-pick-many-commits.sh has been fixed since\n3af0bba8bff88ec1b078aae966a59af26c7a0718.\n\nSigned-off-by: Elijah Newren \n---\n t/t3508-cherry-pick-many-commits.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh\nindex 93d7189..f90ed3d 100755\n--- a/t/t3508-cherry-pick-many-commits.sh\n+++ b/t/t3508-cherry-pick-many-commits.sh\n@@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' '\n \tgit diff --quiet HEAD first\n '\n \n-test_expect_failure 'cherry-pick -3 fourth works' '\n+test_expect_success 'cherry-pick -3 fourth works' '\n \tgit checkout -f master &&\n \tgit reset --hard first &&\n \ttest_tick &&\n-- \n1.7.2.rc0.207.ga9fc\n"},{"id":"144473","messageId":"7v4oglbxn6.fsf@alter.siamese.dyndns.org","threadId":"24227","inReplyTo":"1277775091-13313-1-git-send-email-newren@gmail.com","subject":"Re: [PATCH] Update t3508 status","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-06-29T16:40:13Z","receivedAt":"2010-06-29T16:40:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"newren@gmail.com writes:\n\n> From: Elijah Newren \n>\n> Test #8 of t3508-cherry-pick-many-commits.sh has been fixed since\n> 3af0bba8bff88ec1b078aae966a59af26c7a0718.\n>\n> Signed-off-by: Elijah Newren \n\nCurious.\n\nThis test is broken in the second parent of 3af0bba8b (i.e. the tip of\ncc/cherry-pick-stdin), but in 3af0bba8b, i.e. the merge result, it does\nseem to be fine.\n\nWhat am I missing???\n\n> ---\n> t/t3508-cherry-pick-many-commits.sh | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh\n> index 93d7189..f90ed3d 100755\n> --- a/t/t3508-cherry-pick-many-commits.sh\n> +++ b/t/t3508-cherry-pick-many-commits.sh\n> @@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' '\n> \tgit diff --quiet HEAD first\n> '\n> \n> -test_expect_failure 'cherry-pick -3 fourth works' '\n> +test_expect_success 'cherry-pick -3 fourth works' '\n> \tgit checkout -f master &&\n> \tgit reset --hard first &&\n> \ttest_tick &&\n"},{"id":"144475","messageId":"20100629165032.GA7699@burratino","threadId":"24227","inReplyTo":"7v4oglbxn6.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Update t3508 status","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-06-29T16:50:32Z","receivedAt":"2010-06-29T16:50:32Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n> newren@gmail.com writes:\n\n>> Test #8 of t3508-cherry-pick-many-commits.sh\n[...]\n> Curious.\n> \n> This test is broken in the second parent of 3af0bba8b (i.e. the tip of\n> cc/cherry-pick-stdin), but in 3af0bba8b, i.e. the merge result, it does\n> seem to be fine.\n> \n> What am I missing???\n\nThe fix is in commit v1.7.2-rc0~6^2 (DWIM 'git show -5' to 'git show\n--do-walk -5', 2010-06-01):\n\n disable --no-walk in this case so ‘git show’ and future ‘git\n cherry-pick’ can behave as expected.\n\nJonathan\n"},{"id":"144477","messageId":"201006291904.34009.chriscool@tuxfamily.org","threadId":"24227","inReplyTo":"1277775091-13313-1-git-send-email-newren@gmail.com","subject":"Re: [PATCH] Update t3508 status","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2010-06-29T17:04:33Z","receivedAt":"2010-06-29T17:04:33Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Tuesday 29 June 2010 03:31:31 newren@gmail.com wrote:\n> From: Elijah Newren \n> \n> Test #8 of t3508-cherry-pick-many-commits.sh has been fixed since\n> 3af0bba8bff88ec1b078aae966a59af26c7a0718.\n> \n> Signed-off-by: Elijah Newren \n> ---\n> t/t3508-cherry-pick-many-commits.sh | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/t/t3508-cherry-pick-many-commits.sh\n> b/t/t3508-cherry-pick-many-commits.sh index 93d7189..f90ed3d 100755\n> --- a/t/t3508-cherry-pick-many-commits.sh\n> +++ b/t/t3508-cherry-pick-many-commits.sh\n> @@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2\n> works' ' git diff --quiet HEAD first\n> '\n> \n> -test_expect_failure 'cherry-pick -3 fourth works' '\n> +test_expect_success 'cherry-pick -3 fourth works' '\n> \tgit checkout -f master &&\n> \tgit reset --hard first &&\n> \ttest_tick &&\n\nI tried to put this hunk in the following patch:\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/149156/\n\nbut Junio said in a private mail that the test did not pass for him so he \ndropped this hunk.\n\nBy the way it looks like the third patch in the series has been lost:\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/149157\n\nThanks,\nChristian.\n"},{"id":"144478","messageId":"7vd3v9ah4f.fsf@alter.siamese.dyndns.org","threadId":"24227","inReplyTo":"20100629165032.GA7699@burratino","subject":"Re: [PATCH] Update t3508 status","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-06-29T17:22:24Z","receivedAt":"2010-06-29T17:22:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Junio C Hamano wrote:\n>> newren@gmail.com writes:\n>\n>>> Test #8 of t3508-cherry-pick-many-commits.sh\n> [...]\n>> Curious.\n>> \n>> This test is broken in the second parent of 3af0bba8b (i.e. the tip of\n>> cc/cherry-pick-stdin), but in 3af0bba8b, i.e. the merge result, it does\n>> seem to be fine.\n>> \n>> What am I missing???\n>\n> The fix is in commit v1.7.2-rc0~6^2 (DWIM 'git show -5' to 'git show\n> --do-walk -5', 2010-06-01):\n>\n> disable --no-walk in this case so ‘git show’ and future ‘git\n> cherry-pick’ can behave as expected.\n\nAh, that's it. 3af0bba (Merge branch 'cc/cherry-pick-stdin' into next,\n2010-06-27) is on 'next', so this has to be queued as an evil merge of\nyour \"DWIM\" thing into cc/cherry-pick-stdin. That way, when the latter\ngraduates to 'master', the test will be marked as \"expect_success\".\n\nThanks.\n"}]}