# [PATCH] Update t3508 status 5 messages from 2010-06-29 to 2010-06-29. Participants: newren@gmail.com, Junio C Hamano, Jonathan Nieder, Christian Couder. Thread: https://gitlist.dev/t/24227 ## newren@gmail.com, 2010-06-29 01:31 Subject: [PATCH] Update t3508 status Message-ID: <1277775091-13313-1-git-send-email-newren@gmail.com> URL: https://gitlist.dev/e/1277775091-13313-1-git-send-email-newren%40gmail.com ``` From: Elijah Newren Test #8 of t3508-cherry-pick-many-commits.sh has been fixed since 3af0bba8bff88ec1b078aae966a59af26c7a0718. Signed-off-by: Elijah Newren --- t/t3508-cherry-pick-many-commits.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 93d7189..f90ed3d 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' ' git diff --quiet HEAD first ' -test_expect_failure 'cherry-pick -3 fourth works' ' +test_expect_success 'cherry-pick -3 fourth works' ' git checkout -f master && git reset --hard first && test_tick && -- 1.7.2.rc0.207.ga9fc ``` ## Junio C Hamano, 2010-06-29 16:40 Subject: Re: [PATCH] Update t3508 status Message-ID: <7v4oglbxn6.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4oglbxn6.fsf%40alter.siamese.dyndns.org In-Reply-To: <1277775091-13313-1-git-send-email-newren@gmail.com> ``` newren@gmail.com writes: > From: Elijah Newren > > Test #8 of t3508-cherry-pick-many-commits.sh has been fixed since > 3af0bba8bff88ec1b078aae966a59af26c7a0718. > > Signed-off-by: Elijah Newren Curious. This test is broken in the second parent of 3af0bba8b (i.e. the tip of cc/cherry-pick-stdin), but in 3af0bba8b, i.e. the merge result, it does seem to be fine. What am I missing??? > --- > t/t3508-cherry-pick-many-commits.sh | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh > index 93d7189..f90ed3d 100755 > --- a/t/t3508-cherry-pick-many-commits.sh > +++ b/t/t3508-cherry-pick-many-commits.sh > @@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' ' > git diff --quiet HEAD first > ' > > -test_expect_failure 'cherry-pick -3 fourth works' ' > +test_expect_success 'cherry-pick -3 fourth works' ' > git checkout -f master && > git reset --hard first && > test_tick && ``` ## Jonathan Nieder, 2010-06-29 16:50 Subject: Re: [PATCH] Update t3508 status Message-ID: <20100629165032.GA7699@burratino> URL: https://gitlist.dev/e/20100629165032.GA7699%40burratino In-Reply-To: <7v4oglbxn6.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano wrote: > newren@gmail.com writes: >> Test #8 of t3508-cherry-pick-many-commits.sh [...] > Curious. > > This test is broken in the second parent of 3af0bba8b (i.e. the tip of > cc/cherry-pick-stdin), but in 3af0bba8b, i.e. the merge result, it does > seem to be fine. > > What am I missing??? The fix is in commit v1.7.2-rc0~6^2 (DWIM 'git show -5' to 'git show --do-walk -5', 2010-06-01): disable --no-walk in this case so ‘git show’ and future ‘git cherry-pick’ can behave as expected. Jonathan ``` ## Christian Couder, 2010-06-29 17:04 Subject: Re: [PATCH] Update t3508 status Message-ID: <201006291904.34009.chriscool@tuxfamily.org> URL: https://gitlist.dev/e/201006291904.34009.chriscool%40tuxfamily.org In-Reply-To: <1277775091-13313-1-git-send-email-newren@gmail.com> ``` On Tuesday 29 June 2010 03:31:31 newren@gmail.com wrote: > From: Elijah Newren > > Test #8 of t3508-cherry-pick-many-commits.sh has been fixed since > 3af0bba8bff88ec1b078aae966a59af26c7a0718. > > Signed-off-by: Elijah Newren > --- > t/t3508-cherry-pick-many-commits.sh | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/t/t3508-cherry-pick-many-commits.sh > b/t/t3508-cherry-pick-many-commits.sh index 93d7189..f90ed3d 100755 > --- a/t/t3508-cherry-pick-many-commits.sh > +++ b/t/t3508-cherry-pick-many-commits.sh > @@ -82,7 +82,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 > works' ' git diff --quiet HEAD first > ' > > -test_expect_failure 'cherry-pick -3 fourth works' ' > +test_expect_success 'cherry-pick -3 fourth works' ' > git checkout -f master && > git reset --hard first && > test_tick && I tried to put this hunk in the following patch: http://thread.gmane.org/gmane.comp.version-control.git/149156/ but Junio said in a private mail that the test did not pass for him so he dropped this hunk. By the way it looks like the third patch in the series has been lost: http://thread.gmane.org/gmane.comp.version-control.git/149157 Thanks, Christian. ``` ## Junio C Hamano, 2010-06-29 17:22 Subject: Re: [PATCH] Update t3508 status Message-ID: <7vd3v9ah4f.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vd3v9ah4f.fsf%40alter.siamese.dyndns.org In-Reply-To: <20100629165032.GA7699@burratino> ``` Jonathan Nieder writes: > Junio C Hamano wrote: >> newren@gmail.com writes: > >>> Test #8 of t3508-cherry-pick-many-commits.sh > [...] >> Curious. >> >> This test is broken in the second parent of 3af0bba8b (i.e. the tip of >> cc/cherry-pick-stdin), but in 3af0bba8b, i.e. the merge result, it does >> seem to be fine. >> >> What am I missing??? > > The fix is in commit v1.7.2-rc0~6^2 (DWIM 'git show -5' to 'git show > --do-walk -5', 2010-06-01): > > disable --no-walk in this case so ‘git show’ and future ‘git > cherry-pick’ can behave as expected. Ah, that's it. 3af0bba (Merge branch 'cc/cherry-pick-stdin' into next, 2010-06-27) is on 'next', so this has to be queued as an evil merge of your "DWIM" thing into cc/cherry-pick-stdin. That way, when the latter graduates to 'master', the test will be marked as "expect_success". Thanks. ```