From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: phillip.wood@dunelm.org.uk, Alex Henrie <alexhenrie24@gmail.com>,
git@vger.kernel.org, alban.gruin@gmail.com
Subject: Re: [PATCH] sequencer: finish parsing the todo list despite an invalid first line
Date: Fri, 21 Jul 2023 08:21:00 -0700 [thread overview]
Message-ID: <xmqqpm4lwasj.fsf@gitster.g> (raw)
In-Reply-To: <d6e54535-79a3-2d2c-3152-4cabc5bbd9b8@gmail.com> (Phillip Wood's message of "Fri, 21 Jul 2023 14:08:42 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> On 21/07/2023 10:31, Phillip Wood wrote:
>> That's fine but the commit message should explain that decision and
>> clarify why ddb81e5072 caused the regression
>
> Maybe something like
>
> Before the todo list is edited it is rewritten to shorten the OIDs of
> the commits being picked and to append advice about editing the
> list. The exact advice depends on whether the todo list is being
> edited for the first time or not. After the todo list has been edited
> it is rewritten to lengthen the OIDs of the commits being picked and to
> remove the advice. If the edited list cannot be parsed then this last
> step is skipped.
>
> Prior to db81e50724 (rebase-interactive: use todo_list_write_to_file()
> in edit_todo_list(), 2019-03-05) if the existing todo list could not
> be parsed then the initial rewrite was skipped as well. This had the
> unfortunate consequence that if the list could not be parsed after the
> initial edit the advice given to the user was wrong when they
> re-edited the list. This change relied on
> todo_list_parse_insn_buffer() returning the whole todo list even when
> it cannot be parsed. Unfortunately if the list starts with a "fixup"
> command then it will be truncated and the remaining lines are
> lost. Fix this by continuing to parse after an initial "fixup" commit
> as we do when we see any other invalid line.
>
> Best Wishes
>
> Phillip
That does sounds a lot easier to understand as an explanation for
the reason why this change is necessary and sufficient.
Thanks for reviewing.
next prev parent reply other threads:[~2023-07-21 15:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 14:43 [PATCH] sequencer: finish parsing the todo list despite an invalid first line Alex Henrie
2023-07-19 21:32 ` Junio C Hamano
2023-07-20 9:42 ` Phillip Wood
2023-07-20 22:37 ` Alex Henrie
2023-07-21 9:31 ` Phillip Wood
2023-07-21 13:08 ` Phillip Wood
2023-07-21 15:21 ` Junio C Hamano [this message]
2023-07-21 5:38 ` [PATCH v2 0/1] " Alex Henrie
2023-07-21 5:38 ` [PATCH v2 1/1] " Alex Henrie
2023-07-21 5:58 ` [PATCH v3 0/1] " Alex Henrie
2023-07-21 5:58 ` [PATCH v3 1/1] " Alex Henrie
2023-07-21 6:07 ` [PATCH v4 0/1] " Alex Henrie
2023-07-21 6:07 ` [PATCH v4 1/1] " Alex Henrie
2023-07-21 13:13 ` [PATCH v4 0/1] " Phillip Wood
2023-07-22 21:28 ` [PATCH v5 " Alex Henrie
2023-07-22 21:28 ` [PATCH v5 1/1] " Alex Henrie
2023-07-24 10:02 ` Phillip Wood
2023-07-24 15:26 ` Alex Henrie
2023-07-24 16:00 ` Phillip Wood
2023-07-24 16:40 ` Junio C Hamano
2023-07-24 17:39 ` Alex Henrie
2023-07-24 18:30 ` Junio C Hamano
2023-07-24 20:08 ` Alex Henrie
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=xmqqpm4lwasj.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alban.gruin@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.