From: Avi Kivity <avi@redhat.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: walt <w41ter@gmail.com>, git@vger.kernel.org
Subject: Re: git-bisect not working correctly in the kvm.git repository?
Date: Tue, 18 Nov 2008 22:38:04 +0200 [thread overview]
Message-ID: <492327AC.9020007@redhat.com> (raw)
In-Reply-To: <49226B26.4000807@viscovery.net>
Johannes Sixt wrote:
> If you are pretty sure that the bug you are looking for was *not*
> introduced in the branch that was subtree-merged, you can mark it as
> "good" like so:
>
> $ git bisect start kvm-69 kvm-70 $BRANCH
>
> where $BRANCH is the most recent commit on the subtree-merged branch.
> Watch out that you do *not* accidentally pick the *merge* commit that
> merged the branch in, but the (second) parent[*], the one that was merged
> in. Then your bisect sequence won't ever end up in that branch.
>
Unfortunately, it is fairly likely that the bug was indeed introduced by
the merge, since most of the commits in that repository come via that merge.
It is possible that the bug exists in that branch (which you need to
build as pure qemu, not kvm), but again, it is more likely that the bug
is an interaction between a qemu feature introduced during the merge,
and the existing kvm glue code.
One way around this is to redo the merge from the point git bisect
suggests, but that is difficult, time consuming, and error prone. It
also needs a lot of familiarity with the code.
Fortunately, long term the problem is going away with qemu upstream
gaining kvm support.
--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.
next prev parent reply other threads:[~2008-11-18 20:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-17 17:27 git-bisect not working correctly in the kvm.git repository? walt
2008-11-17 19:34 ` Linus Torvalds
2008-11-17 20:19 ` walt
2008-11-17 20:34 ` Linus Torvalds
2008-11-18 7:13 ` Johannes Sixt
2008-11-18 20:38 ` Avi Kivity [this message]
2008-11-17 19:47 ` Christian Couder
2008-11-17 22:11 ` walt
2008-11-18 5:56 ` Christian Couder
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=492327AC.9020007@redhat.com \
--to=avi@redhat.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=w41ter@gmail.com \
/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