Re: [PATCH] rebase --abort: do not update branch ref

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 22, 2010, 03:11 UTC
Message-ID: <7v1v6evyq5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1290337881-26449-1-git-send-email-martin.von.zweigbergk@gmail.com>

Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:

Show 14 quoted lines

> diff --git a/git-rebase.sh b/git-rebase.sh
> index ec08f9c..3d194b1 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -278,12 +278,17 @@ do
>  		if test -d "$dotest"
>  		then
>  			GIT_QUIET=$(cat "$dotest/quiet")
> -			move_to_original_branch
>  		else
>  			dotest="$GIT_DIR"/rebase-apply
>  			GIT_QUIET=$(cat "$dotest/quiet")
> -			move_to_original_branch
>  		fi

Micronit. It appears that GIT_QUIET is set to the same value in either case, so perhaps you would also want to move it outside of the if block, i.e.

	test -d "$dotest" || dotest="$GIT_DIR/rebase-apply"
        GIT_QUIET=$(cat "$dotest/quiet)
        ... your rewrite to move_to_original_branch here ...

no? Staring at it further, I wonder who pays attention to GIT_QUIET in this codepath that will soon exit, though.

Show 10 quoted lines

> +		head_name="$(cat "$dotest"/head-name)" &&
> +		case "$head_name" in
> +		refs/*)
> +			git symbolic-ref HEAD $head_name ||
> +			die "Could not move back to $head_name"
> +			;;
> +		esac
>  		git reset --hard $(cat "$dotest/orig-head")
>  		rm -r "$dotest"
>  		exit