[PATCH] Update t3508 status

[PATCH] Update t3508 status

[newren]

From: Elijah Newren <newren@gmail.com>

Test #8 of t3508-cherry-pick-many-commits.sh has been fixed since
3af0bba8bff88ec1b078aae966a59af26c7a0718.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 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

Re: [PATCH] Update t3508 status

[Junio C Hamano]

newren@gmail.com writes:

> From: Elijah Newren <newren@gmail.com>
>
> Test #8 of t3508-cherry-pick-many-commits.sh has been fixed since
> 3af0bba8bff88ec1b078aae966a59af26c7a0718.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>

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 &&

Re: [PATCH] Update t3508 status

[Jonathan Nieder]

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

Re: [PATCH] Update t3508 status

[Christian Couder]

On Tuesday 29 June 2010 03:31:31 newren@gmail.com wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> Test #8 of t3508-cherry-pick-many-commits.sh has been fixed since
> 3af0bba8bff88ec1b078aae966a59af26c7a0718.
> 
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  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.

Re: [PATCH] Update t3508 status

[Junio C Hamano]

Jonathan Nieder <jrnieder@gmail.com> 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.