Databases
StackOverflow2013
Postsdbo
POHow do you get git bisect to ignore merged branches?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POHow do you get git bisect to ignore merged branches?
    primarykey
    data
    text
    <p>I'm aware that git bisect is branch-aware by design, so that if between good commit, G, and bad commit, B, you merged in a branch, it needs to take those changes into consideration as well, as the bug may be contained in the branch.</p> <p>In my case I have a dependency as a side branch and I merge in changes to my main project from time to time. The dependency can be considered a library that has a different way of running, different build-system etc. from my main project, but I still want recent changes from it via merges to the main branch.</p> <p>The problem is then that while bisecting in this scenario, you end up on non-compilable commits in the commits from the dependency.</p> <p>I would really just want to consider each branch merge as a single commit while doing the bisection.</p> <p>A workaround I've found so far is making a list of valid commits G..B with git log --first-parent, and then while bisecting, do git bisect skip if the current commit isn't in that list. That takes a lot of time though (lots of files to checkout/change for each skip).</p> <p>So the question is: Is there any way of doing --first-parent with git bisect or providing a list of commits i feel are valid to be able to avoid checking out branches I know already are not compilable? How do we only check the commits marked <strong>o</strong> in the diagram?</p> <pre> G---o---o---o---o---o---o---B main project branch / / / x---x---x---x---x dependency \ / x' dependency project taskbranch </pre> <p><strong>Edit</strong>: added diagram for clarity</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. UStddtrying
    1. UStddtrying
    plurals
    1. This table or related slice is empty.
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POHow do you get git bisect to ignore merged branches?
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POHow do you get git bisect to ignore merged branches?
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. POHow do you get git bisect to ignore merged branches?
      1. This table or related slice is empty.
      1. VTUpMod
    1. COIn my opinion you shouldn't put dependencies in branches, but rather you should use submodules or just plain files containing revision ids or version numbers to use. That would avoid this particular problem.
      singulars
      1. POHow do you get git bisect to ignore merged branches?
      1. USRobin Green
    2. COI agree, in this case they are actually similar projects that share a lot of code. There are probably better ways of organizing that than branches, but I'm still interested in a solution for the given problem.
      singulars
      1. POHow do you get git bisect to ignore merged branches?
      1. UStddtrying
    3. COPosted a workaround I found myself, but would like to see better solutions.
      singulars
      1. POHow do you get git bisect to ignore merged branches?
      1. UStddtrying
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload