From: "Paweł Sikora" <pluto@agmk.net>
To: Valdis.Kletnieks@vt.edu
Cc: Andreas Schwab <schwab@linux-m68k.org>, linux-kernel@vger.kernel.org
Subject: Re: git bisect selects commit outside initial bisect range?
Date: Sun, 3 Oct 2010 21:47:23 +0200 [thread overview]
Message-ID: <201010032147.24197.pluto@agmk.net> (raw)
In-Reply-To: <32106.1285624307@localhost>
On Monday 27 September 2010 23:51:47 Valdis.Kletnieks@vt.edu wrote:
> 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.
thank you very much for explanation!
now i have more complicated problem with bisecting :(
on v2.6.34 kernel kde4 compositing effects works fine on my radeon RV370.
on v2.6.35 i'm observing some blinking during effects composition.
with git-bisect i found some bad (in case of screen blinkng) commit:
[http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=59534f
Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git...]
and earlier branches with good commits:
[http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=ac3ee8
Merge branch 'dbg-early-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwes]
[http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=a7c542
drm/i915: Fix out of tree builds]
[http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=61dd98
drm/edid: Fix 1024x768@85Hz]
right after ^61dd98 there is a small change:
[http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commitdiff;h=bc35af
drm/radeon/kms: add query for crtc hw id from crtc id to get info V2]
which causes xserver hangup (100% cpu-hog) on my machine and after this point
i can't really test another git-bisect commit due to xserver hangup.
can i somehow kick-off the ^61dd98 commit from further bisecting to avoid bug masking?
BR,
Pawel.
next prev parent reply other threads:[~2010-10-03 19:47 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
2010-10-03 19:47 ` Paweł Sikora [this message]
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=201010032147.24197.pluto@agmk.net \
--to=pluto@agmk.net \
--cc=Valdis.Kletnieks@vt.edu \
--cc=linux-kernel@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.