From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Nov 2011 00:43:55 GMT
Subject: Re: [PATCH 5/3] revert: introduce --abort to cancel a failed cherry-pick
Message-ID: <7vr50zd5x0.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20111122112001.GF7399@elie.hsd1.il.comcast.net>

Jonathan Nieder <jrnieder@gmail.com> writes:

> After running some ill-advised command like "git cherry-pick
> HEAD..linux-next", the bewildered novice may want to return to more
> familiar territory.  Introduce a "git cherry-pick --abort" command
> that rolls back the entire cherry-pick sequence and places the
> repository back on solid ground.
>
> Just like "git merge --abort", this internally uses "git reset
> --merge", so local changes not involved in the conflict resolution are
> preserved.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
> ...
> @@ -168,6 +265,7 @@ test_expect_success '--continue continues after conflicts are resolved' '
>  	OBJID
>  	:100644 100644 OBJID OBJID M	unrelated
>  	OBJID
> +	:000000 100644 OBJID OBJID A	bar
>  	:000000 100644 OBJID OBJID A	foo
>  	:000000 100644 OBJID OBJID A	unrelated
>  	EOF

What is this hunk about?  Don't you also need another one to the test
after that one?  When merged with rr/revert-cherry-pick series, t3510 seems
to misbehave around this area.