Re: [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode

From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: May 29, 2013, 11:13 UTC
Message-ID: <51A5E2F7.4090505@gmail.com>
In-Reply-To: <1369801000-3705-5-git-send-email-felipe.contreras@gmail.com>

On 05/29/2013 06:16 AM, Felipe Contreras wrote:

Show 15 quoted lines

> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
>  git-rebase.sh | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 76900a0..9b5d78b 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -335,6 +335,7 @@ skip)
>  	run_specific_rebase
>  	;;
>  abort)
> +	test "$type" == "cherrypick" && git cherry-pick --abort
>

Bashism; please use "=", not "==".

>  	git rerere clear
>  	read_basic_state
>  	case "$head_name" in

Regards,
  Stefano