Re: git-bisect problem

From: Ryan Anderson <ryan@michonline.com>
Date: Feb 13, 2006, 10:14 UTC
Message-ID: <20060213101443.GD11053@mythryan2.michonline.com>
In-Reply-To: <20060213015146.26e6c09d.akpm@osdl.org>

On Mon, Feb 13, 2006 at 01:51:46AM -0800, Andrew Morton wrote:

Show 8 quoted lines

> 
> Assuming I find the bad commit, how do I extract it as a patch?
> 
> I tried
> 
> git-format-patch -o ~/a 386093ef9a6c88576d8b418bf1c8616d5e410a20 git-netdev-all
> 
> and that chewed 10 minutes CPU time and produced no output, so I killed it.

Well, assuming it's not a merge, you'll want something like this:

git format-patch -o ~/a 386093ef9a6c88576d8b418bf1c8616d5e410a20^1..386093ef9a6c88576d8b418bf1c8616d5e410a20

For essentially the same output, you can do a few other variations:

git whatchanged -p 386093ef9a6c88576d8b418bf1c8616d5e410a20^1..386093ef9a6c88576d8b418bf1c8616d5e410a20 git diff 386093ef9a6c88576d8b418bf1c8616d5e410a20^1..386093ef9a6c88576d8b418bf1c8616d5e410a20

If it's a merge that bisect terminates on, things get a bit trickier, as
you want to figure out what went wrong in the merge to cause it, so
you'll want to use either the syntax for specifying which merge parent
to look at (which I forget at the moment) or, run:
	git rev-list --parents --max-count=1 386093ef9a6c88576d8b418bf1c8616d5e410a20
and look at columns 2+ individually.

In fact, if you want, you can re-do the merge, by creating some branches based off of each parent, then pulling one into the other, and seeing what went wrong.

Hope that helps (if not, I apologize - I should've gone to bed a while ago and it may have snuck through)

-- 
Ryan Anderson
  sometimes Pug Majere