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

Re: [PATCH 3/5] sequencer: move current fixups to private context

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 18, 2024, 20:48 UTC
Message-ID
<xmqq34ris8hq.fsf@gitster.g>
In-Reply-To
<2e4a2168733cb226a6fd660cb0d0bd700a1e7d86.1713445918.git.phillip.wood@dunelm.org.uk>
Phillip Wood <phillip.wood123@gmail.com> writes:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> The list of current fixups is an implementation detail of the sequencer
> and so it should not be stored in the public options struct.

It feels curious how 2/5 and 3/5 treat "fixups" and "reflog" differently.

I would have expected them to be either in a single patch, or if we really wanted to split them for readability, do a preliminary change in 2/5 that argues that "fixups" does not really belong to _opts but is a private state just like "reflog" and moves it from "/* Used by fixup/squash */" section to the "/* Private use */" section at the end, and then introduce the _ctx in 3/5 to move these three together.

The end result would be the same, but I would have found the flow of thought more straight-forward if presented that way.

Previous: Phillip WoodNext: Phillip Wood
Message 6 of 10 in “rebase -m: fix --signoff with conflicts”
  1. 0/5 rebase -m: fix --signoff with conflictsPhillip Wood, Apr 18, 2024
  2. 1/5 sequencer: always free "struct replay_opts"Phillip Wood, Apr 18, 2024
  3. 2/5 sequencer: start removing private fields from public APIPhillip Wood, Apr 18, 2024
  4. Junio C HamanoApr 18, 2024
  5. 3/5 sequencer: move current fixups to private contextPhillip Wood, Apr 18, 2024
  6. Junio C HamanoApr 18, 2024
  7. 4/5 sequencer: store commit message in private contextPhillip Wood, Apr 18, 2024
  8. Junio C HamanoApr 18, 2024
  9. 5/5 rebase -m: fix --signoff with conflictsPhillip Wood, Apr 18, 2024
  10. Junio C HamanoApr 18, 2024

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.