From: Stefan Beller <sbeller@google.com>
To: Harald Nordgren <haraldnordgren@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH] Create '--merges-only' option for 'git bisect'
Date: Wed, 11 Apr 2018 16:33:58 -0700 [thread overview]
Message-ID: <CAGZ79kbt=J5SHsHJTfOZYhgSdn9_gOjVBC3qp_oL0sC-b3ZRmw@mail.gmail.com> (raw)
In-Reply-To: <20180411225534.48658-1-haraldnordgren@gmail.com>
On Wed, Apr 11, 2018 at 3:55 PM, Harald Nordgren
<haraldnordgren@gmail.com> wrote:
> When ran with '--merges-only', git bisect will only look at merge commits -- commits with 2 or more parents or the initial commit.
There has been quite some talk on the mailing list, e.g.
https://public-inbox.org/git/20160427204551.GB4613@virgo.localdomain/
which suggests a --first-parent mode instead. For certain histories
these are the same,
but merges-only is more restrictive for back-and-forth-cross merges.
>
> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
> ---
>
> Notes:
> Proof of concept of a feature that I have wanted in Git for a while. In my daily work my company uses GitHub, which creates lots of merge commits. In general, tests are only ran on the tip of a branch before merging, so the different commits within a merge commit are allowed not to be buildable. Therefore 'git bisect' often doesn't work since it will give lots of false positives for anything that is not a merge commit. If we could have a feature to only bisect merge commits then it would be easier to pinpoint which merge causes any particular issue. After that, a bisect could be done within the merge to pinpoint futher. As a follow-up to this patch -- we could potentially create a feature that automatically continues into regular bisect within the bad merge commit after completed '--merges-only' bisection.
The github workflow you mention sounds as if --first-parent would do, too?
next prev parent reply other threads:[~2018-04-11 23:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-11 22:55 [PATCH] Create '--merges-only' option for 'git bisect' Harald Nordgren
2018-04-11 23:33 ` Stefan Beller [this message]
2018-04-12 7:49 ` Harald Nordgren
2018-04-12 8:58 ` Christian Couder
2018-04-12 9:27 ` Tiago Botelho
2018-04-12 11:53 ` Johannes Schindelin
2018-04-12 12:19 ` Tiago Botelho
2018-04-30 11:31 ` Johannes Schindelin
2018-04-30 11:34 ` Tiago Botelho
2018-05-01 11:31 ` Johannes Schindelin
2018-04-12 11:35 ` Johannes Schindelin
2018-04-12 11:33 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGZ79kbt=J5SHsHJTfOZYhgSdn9_gOjVBC3qp_oL0sC-b3ZRmw@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=haraldnordgren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).