From: Petr Tesarik <ptesarik@suse.com>
To: Thorsten Leemhuis <linux@leemhuis.info>
Cc: Jonathan Corbet <corbet@lwn.net>,
regressions@lists.linux.dev, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
Bagas Sanjaya <bagasdotme@gmail.com>
Subject: Re: [PATCH v2] docs: bug-bisect: rewrite to better match the other bisecting text
Date: Wed, 21 Aug 2024 21:02:26 +0200 [thread overview]
Message-ID: <20240821210226.25862313@mordecai> (raw)
In-Reply-To: <e6681b51-297e-4ef8-a199-d36712088740@leemhuis.info>
On Tue, 20 Aug 2024 19:16:25 +0200
Thorsten Leemhuis <linux@leemhuis.info> wrote:
> On 20.08.24 14:07, Petr Tesarik wrote:
> > On Sun, 18 Aug 2024 18:12:13 +0200
> > Thorsten Leemhuis <linux@leemhuis.info> wrote:
> >
> >> Rewrite the short document on bisecting kernel bugs. The new text
> >> improves .config handling, brings a mention of 'git skip', and explains
> > Nitpick: git bisect skip
>
> Ohh, one of those cases where one misses the most obvious mistakes. Thx
> for pointing this out!
>
> Also: many thx for your feedback in general, performed a most of the
> changes you suggested (thx again), only replying to a few other bits.
>
>
> > But it's still difficult to parse for me. Maybe it would be better to
> > reorder the sentence like this:
> >
> > After issuing one of these commands, if Git checks out another
> > bisection point and prints something like 'Bisecting: 675 revisions
> > left to test affter this (roughly 10 steps)', then go back to step 1.
>
> Chose to do it slightly different:
>
> After issuing one of these two commands, Git will usually check out another
> bisection point and print something like 'Bisecting: 675 revisions left to
> test after this (roughly 10 steps)'. In that case go back to step 1.
That's just as good for me. Keep your wording.
> >> + Git might reject this, for example when the bisection landed on a merge
> >> + commit. In that case, abandon the attempt. Do the same, if Git fails to revert
> >> + the culprit on its own because later changes depend on it -- at least unless
> >> + you bisected using a stable or longterm kernel series, in which case you want
> >> + to retry using the latest code from that series.
> >
> > Admittedly, this paragraph left me a bit confused. So, what is your
> > suggestion if I bisected using a stable or longterm kernel series (BTW
> > shouldn't we use Git-speak and call it a branch?)
>
> Not having a strong opinion here, but I'd say "series" is the better word
> here; but maybe "using" should go (see below).
Good point. I don't have a strong opinion either, so let's go with
"series".
>
> > and Git fails to
> > revert the commit because some later changes depend on the commit?
> > Are you trying to say I should check out the current head of that
> > stable or longterm branch and retry the revert there?
>
> Yeah. Changed the text slightly; does it make things better?
>
> Git might reject this, for example when the bisection landed on a merge
> commit. In that case, abandon the attempt. Do the same, if Git fails to revert
> the culprit on its own because later changes depend on it -- at least unless
> you bisected a stable or longterm kernel series, in which case you want to
> check out its latest codebase and try a revert there.
Yes, this makes it crystal clear what I am supposed to do.
> > Overall, it all looks good to me.
> > Thank you very much for your effort!
>
> Thx for saying that, the time your spend, and your feedback,
> much appreciated!
No problem. It's you who has done the hard work.
Petr T
prev parent reply other threads:[~2024-08-21 19:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-18 16:12 [PATCH v2] docs: bug-bisect: rewrite to better match the other bisecting text Thorsten Leemhuis
2024-08-19 8:42 ` Bagas Sanjaya
2024-08-20 12:07 ` Petr Tesarik
2024-08-20 17:16 ` Thorsten Leemhuis
2024-08-21 19:02 ` Petr Tesarik [this message]
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=20240821210226.25862313@mordecai \
--to=ptesarik@suse.com \
--cc=bagasdotme@gmail.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@leemhuis.info \
--cc=regressions@lists.linux.dev \
/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