From: Andrew Morton Date: Mon, 13 Feb 2006 10:25:27 GMT Subject: Re: git-bisect problem Message-ID: <20060213022527.3f888666.akpm@osdl.org> In-Reply-To: <20060213101443.GD11053@mythryan2.michonline.com> Ryan Anderson wrote: > > On Mon, Feb 13, 2006 at 01:51:46AM -0800, Andrew Morton wrote: > > > > 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 That worked. > 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. It did terminate on a merge. Thats over four hours gone and, frankly, I'm sick of it. I just want the darned diffs so I can do something useful. > 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) It does. I'm still not having much success geting a string of patches out of it. git format-patch -o ~/a d834a41c966c6a20368fadb59248740935e6fbae..826eeb53a6f264842200d3311d69107d2eb25f5e Has chewed 5 minutes CPU so far and hasn't produced anything. How do I get the IPW patches out of Jeff's tree, in order? I guess since I found a command which actually works, I can type that 20-odd times.