Re: [PATCH] Properly git-bisect reset after bisecting from non-master head

From: Junio C Hamano <junkio@cox.net>
Date: Feb 12, 2006, 19:33 UTC
Message-ID: <7vhd749xtl.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20060212160614.GV31278@pasky.or.cz>

Petr Baudis <pasky@suse.cz> writes:

Show 20 quoted lines

> diff --git a/git-bisect.sh b/git-bisect.sh
> index 51e1e44..3c024aa 100755
> --- a/git-bisect.sh
> +++ b/git-bisect.sh
> @@ -49,9 +49,16 @@ bisect_start() {
>  	die "Bad HEAD - I need a symbolic ref"
>  	case "$head" in
>  	refs/heads/bisect*)
> -		git checkout master || exit
> +		if [ -s "$GIT_DIR/head-name" ]; then
> +		    branch=`cat "$GIT_DIR/head-name"`
> +		else
> +		    branch=master
> +	        fi
> +		git checkout $branch || exit
>  		;;
>  	refs/heads/*)
> +		[ -s "$GIT_DIR/head-name" ] && die "won't bisect on seeked tree"
> +		echo "$head" | sed 's#^refs/heads/##' >"$GIT_DIR/head-name"
>  		;;

Hmph. It seems that $GIT_DIR/head-name might want to be a symbolic ref?

But other than that the patch looks sane, being able to go back to the original branch, and preventing starting to bisect while bisecting are useful and safe changes. Thanks.