git/list[1] front-page[2] threads[3] people[4] search[5] about
 

RE: git bisect and the merge from hell

From
Luck, Tony <tony.luck@intel.com>
Date
Feb 3, 2006, 23:16 UTC
Message-ID
<B8E391BBE9FE384DAA4C5C003888BE6F059F4AF6@scsmsx401.amr.corp.intel.com>
Show 7 quoted lines
> "git bisect visualize" really makes it very obvious what to try next, I 
> think. Which exact commit you try next probably depends on what the 
> compile error was. I'd try
>
>	git reset --hard 3d5271f9883cba7b54762bc4fe027d4172f06db7
>
> (which is after the "pull release into acpica branch" commit).
Yup, that got the bisection moving again.  I finished up at:
$ git bisect bad
96db255c8f014ae3497507104e8df809785a619f is first bad commit
diff-tree 96db255c8f014ae3497507104e8df809785a619f (from 0897831bb54eb36fd9e2a22da7f0f64be1b20d09)
Author: Bob Moore <robert.moore@intel.com>
Date:   Wed Nov 2 00:00:00 2005 -0500
    [ACPI] ACPICA 20051102

So Len's mega-octopus merge wasn't a problem at all, but this is still all his fault :-) I'll go beat on him.

Thanks for the tip.
-Tony
Next: Linus Torvalds
Message 1 of 2 in “RE: git bisect and the merge from hell”
  1. Luck, TonyFeb 3, 2006
  2. Linus TorvaldsFeb 3, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.