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

Re: Bisect limited to Merge Commits

From
HPHagen Paul Pfeifer <hagen@jauu.net>
Date
Apr 28, 2016, 06:19 UTC
Message-ID
<20160428061929.GA11322@virgo.localdomain>
In-Reply-To
<57213041.5070506@kdbg.org>
* Johannes Sixt | 2016-04-27 23:33:53 [+0200]:
Hey Junio, hey Hannes,
Show 7 quoted lines
> git bisect start
> git rev-list --first-parent --boundary origin..origin/pu |
>   sed -ne s/-//p | xargs git bisect good
> git bisect bad origin/pu
>
>and it starts bisecting among the 50-something first-parent commits between
>origin and origin/pu.

just for clarification: contributors rebase their work before pushing it on master. The integrator simple merges --no-ff the individual branches. Just a regular workflow, nothing special - except that many contributor commits will not build. ;(

The idea is just to skip the contributor commits during bisect and focus on the merge commits (the ones with more than one ancestors) because they are likely build and testable.

One possible approach is probably to sort out all non-merge commits before bisecting and bisect only on a this set of commits. The advantage is that the first bad commit is the merge commit introduced the regression. Mmmh, any comments?

hgn
Previous: Junio C HamanoNext: Jacob Keller
Message 5 of 6 in “Bisect limited to Merge Commits”
  1. Hagen Paul PfeiferApr 27, 2016
  2. Junio C HamanoApr 27, 2016
  3. Johannes SixtApr 27, 2016
  4. Junio C HamanoApr 27, 2016
  5. Hagen Paul PfeiferApr 28, 2016
  6. Jacob KellerApr 28, 2016

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.