Re: [PATCH] Update t3508 status
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 29, 2010, 16:40 UTC
- Message-ID
- <7v4oglbxn6.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1277775091-13313-1-git-send-email-newren@gmail.com>
newren@gmail.com writes:
Show 6 quoted lines
> 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???
Show 17 quoted lines
> --- > 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 &&