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

Re: Using git-bisect to find more than one breakage

From
JFJ. Bruce Fields <bfields@fieldses.org>
Date
Dec 13, 2006, 14:34 UTC
Message-ID
<20061213143404.GA24132@fieldses.org>
In-Reply-To
<6280325c0612112034x373c8022q909ca192a866cfcf@mail.gmail.com>
On Tue, Dec 12, 2006 at 03:04:29PM +1030, n0dalus wrote:
Show 19 quoted lines
> This is what I tried to do:
> - Make a branch ("working") at the bad commit
> - Commit a patch to undo the bug-causing change from that commit
> - Make a copy of the master branch
> - git-rebase working
> - (Then if that worked, use git-bisect to find the next breakage)
> 
> I expected git-rebase to just apply all the commits from the master
> onto my working branch, possibly stopping in the case of a conflict to
> the file I patched. Instead, it produces large conflicts with
> unrelated files, on the very first commit it tries to apply. I even
> get the conflicts if the commit I make before using git-rebase changes
> no files at all (just adding an empty file 'test').
> 
> Is there something wrong with my method here? Is there another way to do 
> this?
> 
> I am thinking for now I will just use git-bisect between the bad
> commit and master, and apply my changes to every bisection.
Yes, that's the way to do it.

The git-rebase command is intended for rebasing small pieces of purely linear history; I don't believe it will work well (at all?) to rebase a large chunk of kernel history.

Previous: n0dalusNext: n0dalus
Message 2 of 3 in “Using git-bisect to find more than one breakage”
  1. n0dalusDec 12, 2006
  2. J. Bruce FieldsDec 13, 2006
  3. n0dalusDec 13, 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.