Re: [PATCH 17/18] revert: Introduce --continue to continue the operation

From: Christian Couder <chriscool@tuxfamily.org>
Date: Aug 4, 2011, 04:57 UTC
Message-ID: <201108040657.24610.chriscool@tuxfamily.org>
In-Reply-To: <1312222025-28453-18-git-send-email-artagnon@gmail.com>

On Monday 01 August 2011 20:07:04 Ramkumar Ramachandra wrote:

Show 7 quoted lines

>
> +test_expect_success '--continue complains when there are unresolved
> conflicts' '
> +	pristine_detach initial &&
> +	test_must_fail git cherry-pick base..picked &&
> +	test_must_fail git cherry-pick --continue
> +'

When I try to manually run the above test I get:

-----------------------------------

$ pristine_detach initial     
Warning: you are leaving 1 commit behind, not connected to
any of your branches:

  30b20f1 unrelatedpick

HEAD is now at df2a63d... initial
$
$ git cherry-pick base..picked                                                                                          
[detached HEAD 30b20f1] unrelatedpick
 Author: A U Thor <author@example.com>
 1 files changed, 1 insertions(+), 1 deletions(-)
Auto-merging foo
CONFLICT (content): Merge conflict in foo
error: could not apply fdc0b12... picked
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
$
$ git cherry-pick --continue                                                                                            
fatal: No cherry-pick in progress

-----------------------------------

So it complains because there is no cherry-pick in progress, not because there are unresolved conflicts.

Thanks, Christian.