From: "Kalle Pokki" <kalle.pokki@iki.fi>
To: git@vger.kernel.org
Subject: git bisect with history manipulation
Date: Mon, 23 Oct 2006 17:22:41 +0300 [thread overview]
Message-ID: <a425f86c0610230722r2a0ae473o467d303f915b6c1e@mail.gmail.com> (raw)
In-Reply-To: <a425f86c0610230718i556537dei9a4b2a5fa8d7f003@mail.gmail.com>
Hi,
I'm still pretty new with git, and cannot quite figure out how to use
"git bisect" effectively in this special case: I'm running an embedded
powerpc board, to which I need about a dozen platform patches in the
kernel. Originally I made the patches with quilt on top of 2.6.15.4. I
recently started using git, and just applied the patches on top of
v2.6.18. However, the system seems to oops at every boot now. So I did
"git branch downgrade && git reset --hard v2.6.15" and applied my
patches on top of it to create a starting state similar to what I had
previously. There everything is ok.
Wanting to try to bisect the kernel versions, I then merged the master
branch into the downgrade branch. Then I marked my last platform
commit as good, and v2.6.18 as bad. However the bisect algorithm seems
to group the platform patches near v2.6.18 instead of v2.6.15, since I
don't have the platform files in the bisect checkout. And since I
don't have the platform files, I can't compile a kernel that would run
on my board.
So is there any way to insert a few patches to an arbitrary point
backwards in time and start bisecting from that to the present time?
Or am I thinking this somehow all wrong?
next parent reply other threads:[~2006-10-23 14:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <a425f86c0610230718i556537dei9a4b2a5fa8d7f003@mail.gmail.com>
2006-10-23 14:22 ` Kalle Pokki [this message]
2006-10-23 15:34 ` git bisect with history manipulation Linus Torvalds
2006-10-23 15:42 ` Jakub Narebski
2006-10-23 15:59 ` Linus Torvalds
[not found] ` <20061023114738.f77efec3.seanlkml@sympatico.ca>
2006-10-23 15:47 ` Sean
2006-10-23 16:19 ` Jakub Narebski
[not found] ` <20061023122527.4c095580.seanlkml@sympatico.ca>
2006-10-23 16:25 ` Sean
2006-10-23 16:21 ` Catalin Marinas
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=a425f86c0610230722r2a0ae473o467d303f915b6c1e@mail.gmail.com \
--to=kalle.pokki@iki.fi \
--cc=git@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).