git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] sequencer: finish parsing the todo list despite an invalid first line

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 21, 2023, 15:21 UTC
Message-ID
<xmqqpm4lwasj.fsf@gitster.g>
In-Reply-To
<d6e54535-79a3-2d2c-3152-4cabc5bbd9b8@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 29 quoted lines
> 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.
Previous: Phillip WoodNext: Alex Henrie
Message 7 of 23 in “sequencer: finish parsing the todo list despite an invalid first line”
  1. sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 19, 2023
  2. Junio C HamanoJul 19, 2023
  3. Phillip WoodJul 20, 2023
  4. Alex HenrieJul 20, 2023
  5. Phillip WoodJul 21, 2023
  6. Phillip WoodJul 21, 2023
  7. Junio C HamanoJul 21, 2023
  8. 0/1 sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 21, 2023
  9. 1/1 sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 21, 2023
  10. 0/1 sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 21, 2023
  11. 1/1 sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 21, 2023
  12. 0/1 sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 21, 2023
  13. 1/1 sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 21, 2023
  14. Phillip WoodJul 21, 2023
  15. 0/1 sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 22, 2023
  16. 1/1 sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie, Jul 22, 2023
  17. Phillip WoodJul 24, 2023
  18. Alex HenrieJul 24, 2023
  19. Phillip WoodJul 24, 2023
  20. Junio C HamanoJul 24, 2023
  21. Alex HenrieJul 24, 2023
  22. Junio C HamanoJul 24, 2023
  23. Alex HenrieJul 24, 2023

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.