Git development
 help / color / mirror / Atom feed
From: Petr Baudis <pasky@suse.cz>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Properly git-bisect reset after bisecting from non-master head
Date: Sun, 12 Feb 2006 20:41:46 +0100	[thread overview]
Message-ID: <20060212194146.GX31278@pasky.or.cz> (raw)
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...
> 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

  reply	other threads:[~2006-02-12 19:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-12 16:06 [PATCH] Properly git-bisect reset after bisecting from non-master head Petr Baudis
2006-02-12 19:33 ` Junio C Hamano
2006-02-12 19:41   ` Petr Baudis [this message]
2006-02-12 20:35     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060212194146.GX31278@pasky.or.cz \
    --to=pasky@suse.cz \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox