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

From: Petr Baudis <pasky@suse.cz>
Date: Feb 12, 2006, 19:41 UTC
Message-ID: <20060212194146.GX31278@pasky.or.cz>
In-Reply-To: <7vhd749xtl.fsf@assigned-by-dhcp.cox.net>

Dear diary, on Sun, Feb 12, 2006 at 08:33:26PM CET, I got a letter where Junio C Hamano <junkio@cox.net> said that...

Show 25 quoted lines

> Petr Baudis <pasky@suse.cz> writes:
> 
> > 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?

That probably isn't a bad idea per se, but I can't think of anything which that would improve either, and this has the plus of being compatible with Cogito.

Anyway, if you want a symref, you should probably give it a different name.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Of the 3 great composers Mozart tells us what it's like to be human,
Beethoven tells us what it's like to be Beethoven and Bach tells us
what it's like to be the universe.  -- Douglas Adams