git bisect with history manipulation
- From
- Kalle Pokki <kalle.pokki@iki.fi>
- Date
- Oct 23, 2006, 14:22 UTC
- Message-ID
- <a425f86c0610230722r2a0ae473o467d303f915b6c1e@mail.gmail.com>
- 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?