Re: git bisect with history manipulation

From: Catalin Marinas <catalin.marinas@arm.com>
Date: Oct 23, 2006, 16:21 UTC
Message-ID: <tnxlkn73svi.fsf@arm.com>
In-Reply-To: <BAYC1-PASMTP01856E85F8D54BE3CBF69EAE000@CEZ.ICE>

Sean <seanlkml@sympatico.ca> wrote:

Show 6 quoted lines

> On Mon, 23 Oct 2006 17:22:41 +0300
> "Kalle Pokki" <kalle.pokki@iki.fi> wrote:
>
>> 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?

[...]

> You could use the Stacked Git utility (which is a Quilt like clone
> built on top of Git) to help you along in this process.  Actually,
> you may be able to do the same thing with Quilt itself, but i don't
> know i've never used it.

It's on my todo list to actually add bisect support to StGIT (someone suggested it on the mailing list) but I can't give any estimates about when this would be done. The idea is that it will only bisect the base and push the patches on top of the new tree (at a first though, it doesn't look difficult at all).

Otherwise, use StGIT to manage the patches and the following sequence for bisecting:

$ git bisect start $ stg init $ stg pick <patch@branch> $ stg pick <patch@branch> $ ... $ stg pop -a $ git bisect good v2.6.x $ git bisect bad $ stg push -a $ ... test ... $ stg pop -a $ git bisect good|bad $ stg push -a $ ...

-- 
Catalin