From: Junio C Hamano <gitster@pobox.com>
To: Jonas Rebmann <kernel@schlaraffenlan.de>
Cc: git@vger.kernel.org, Chris Down <chris@chrisdown.name>,
Jeff King <peff@peff.net>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v4 0/3] Avoid hardcoded "good"/"bad" bisect terms
Date: Fri, 15 May 2026 04:56:27 +0900 [thread overview]
Message-ID: <xmqqv7cpepec.fsf@gitster.g> (raw)
In-Reply-To: <20260514-bisect-terms-v4-0-b3e3cf1b06ce@schlaraffenlan.de> (Jonas Rebmann's message of "Thu, 14 May 2026 11:07:03 +0200")
Jonas Rebmann <kernel@schlaraffenlan.de> writes:
> While checking whether all output messages of git bisect were covered by
> [PATCH 1/3] bisect: use selected alternate terms in status output I
> found hardcoded good/bad refs leading to incompatibility of git
> rev-parse --bisect with alternate bisect run terms. This is addressed by
> [PATCH 3/3] rev-parse: use selected alternate terms to look up refs
>
> Signed-off-by: Jonas Rebmann <kernel@schlaraffenlan.de>
> ---
> Changes in v4:
> - Always print bisect terms in single quote (Thanks, Junio)
> - Split out quoting of bisect terms into separate commit
>> - Link to v3: https://patch.msgid.link/20260417-bisect-terms-v3-0-d659fa547261@schlaraffenlan.de
Having this "Link" is better than nothing, but it alone is not
sufficient to help those who mechanise patch consumption with b4.
https://b4.docs.kernel.org/en/latest/index.html
Please make sure that your cover letter of the (i+1)th iteration
[v(i+1) 0/N] is a reply to the cover letter of the i-th iteration
[v(i) 0/M]. With that, anybody who has the i-th iteration can
1. Check out the i-th iteration, e.g.,
$ git checkout jr/bisect-custom-terms-in-output
2. Peek at any of the commits on the topic branch with notes/amlog
e.g.,
$ git notes --ref=amlog show HEAD
3. Check out the base, e.g.,
$ git checkout --detach master...
Note that the branch that holds the i-th iteration can now be
accessed via @{-1} (i.e., the branch previously checked out).
4. Tell B4 to fetch the latest round of the same series, by giving
one/any of the message-ID we learned earlier, and apply them.
$ b4 am -o- \
"<20260417-bisect-terms-v3-2-d659fa547261@schlaraffenlan.de>" |
git am -s
5. See what changed with range-diff
$ git range-diff @{-1}...
6. When satisified, replace the topic with the new iteration.
$ git checkout -B @{-1}
It is crucial that b4 can find the newer iteration when given a
message-ID from the older iteration in step 4 for this workflow to
work, and for that, [v4 0/3] must be a reply to [v3 0/2]. Otherwise
b4 will say that v3 is still the last iteration and we cannot make
progress.
> Changes in v3:
> - when referencing newly introduced terms, reference them in single
> quotes (Thanks, Phillip)
> - Prefer test_grep over grep in updated Tests (Thanks, Phillip)
> - Improve commit messages (Thanks, Phillip)
> - Don't leak memory after read_bisect_terms() (Thanks, Phillip)
> - Don't leak memory after xstrfmt() (Thanks, Junio)
> - Add test case to patch 2/2
> - Link to v2: https://patch.msgid.link/20260323-bisect-terms-v2-0-8d6bdb2c9c7e@schlaraffenlan.de
With these improvements, v3 was already in a quite good shape, but
the latest makes it look even better. Will replace. Thanks.
next prev parent reply other threads:[~2026-05-14 19:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-14 9:07 [PATCH v4 0/3] Avoid hardcoded "good"/"bad" bisect terms Jonas Rebmann
2026-05-14 9:07 ` [PATCH v4 1/3] bisect: use selected alternate terms in status output Jonas Rebmann
2026-05-14 9:07 ` [PATCH v4 2/3] bisect: print bisect terms in single quotes Jonas Rebmann
2026-05-14 9:07 ` [PATCH v4 3/3] rev-parse: use selected alternate terms to look up refs Jonas Rebmann
2026-05-14 19:56 ` Junio C Hamano [this message]
2026-05-15 8:07 ` [PATCH v4 0/3] Avoid hardcoded "good"/"bad" bisect terms Jonas Rebmann
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=xmqqv7cpepec.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=chris@chrisdown.name \
--cc=git@vger.kernel.org \
--cc=kernel@schlaraffenlan.de \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
/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