From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 May 2013 22:31:22 GMT
Subject: Re: [PATCH 3/5] rebase: fix sequence continuation
Message-ID: <7v4ndmybwl.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1369747757-10192-4-git-send-email-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> We are not in am mode.

That may make sense, but shouldn't this part be like so from the
very beginning?  In other words, this looks like an "oops, 1/5 was
buggy and this is a hotfix".

>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
>  git-rebase--cherry.sh | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh
> index ab1f8b7..ca78b1b 100644
> --- a/git-rebase--cherry.sh
> +++ b/git-rebase--cherry.sh
> @@ -5,13 +5,15 @@
>  
>  case "$action" in
>  continue)
> -	git am --resolved --resolvemsg="$resolvemsg" &&
> -	move_to_original_branch
> +	git cherry-pick --continue &&
> +	move_to_original_branch &&
> +	rm -rf "$state_dir"
>  	exit
>  	;;
>  skip)
> -	git am --skip --resolvemsg="$resolvemsg" &&
> -	move_to_original_branch
> +	git cherry-pick --skip &&
> +	move_to_original_branch &&
> +	rm -rf "$state_dir"
>  	exit
>  	;;
>  esac