public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Valdis.Kletnieks@vt.edu
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: "Paweł Sikora" <pluto@agmk.net>, linux-kernel@vger.kernel.org
Subject: Re: git bisect selects commit outside initial bisect range?
Date: Mon, 27 Sep 2010 17:51:47 -0400	[thread overview]
Message-ID: <32106.1285624307@localhost> (raw)
In-Reply-To: Your message of "Mon, 27 Sep 2010 22:29:13 +0200." <m2fwwv7wx2.fsf@igel.home>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=us-ascii, Size: 1315 bytes --]

On Mon, 27 Sep 2010 22:29:13 +0200, Andreas Schwab said:
> Paweł Sikora <pluto@agmk.net> writes:
> 
> > i've started git bisect between good-v2.6.34 and bad-v2.6.35-rc1
> > and after few steps git-bisect jumps to commit before v2.6.34.
> >
> > [~/src/linux/linux-2.6]$ make kernelrelease
> > 2.6.34-rc6-00551-g7a6cb0d
> >
> > is it normal that bisect selects next step outside initial range?
> 
> It's not outside the range:
> 
> $ git rev-list v2.6.34..v2.6.35-rc1 | grep ^7a6cb0d
> 7a6cb0d5497418599d2125b670926b75e673861c
> 
> 7a6cb0d is a commit in a branch reachable from v2.6.35-rc1 but not from
> v2.6.34.

I think he was confused because that commit is in an section of the tree
that was committed to a maintainer tree before 2.6.34 - so when he boots
the resulting kernel it says 2.6.33-rc3-mumble or similar.  I know it threw
me for a loop the first few times it happened.

Pawel: What's happened is you're looking at a commit that got into a maintainer
tree *before* 2.6.34 came out (so the top-level Makefile *at that time in that
tree* said 2.6.33-mumble or something), but the maintainer fed it into Linus's
tree in the merge window *after* 2.6.34 shipped.  Yes, it's bizarre, but that's
how git deals with it.  If you look at the graph produced by 'git bisect
visualize' it makes a bit more sense.


[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]

  reply	other threads:[~2010-09-27 21:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-27 18:51 git bisect selects commit outside initial bisect range? Paweł Sikora
2010-09-27 19:26 ` N.P.S. N.P.S.
2010-09-27 20:29 ` Andreas Schwab
2010-09-27 21:51   ` Valdis.Kletnieks [this message]
2010-10-03 19:47     ` Paweł Sikora
2010-09-29 18:17 ` Paolo Ornati

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=32106.1285624307@localhost \
    --to=valdis.kletnieks@vt.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pluto@agmk.net \
    --cc=schwab@linux-m68k.org \
    /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