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

Re: [PATCH 2/2] rebase: remember fixup -c after skipping fixup/squash

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 26, 2026, 21:32 UTC
Message-ID
<xmqqse55tp1k.fsf@gitster.g>
In-Reply-To
<c9631a42-ea7b-45bb-a153-0372784b8f24@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
> I'm not sure the space thing makes much difference as this isn't the 
> todo file that the user edits. We're reading a file that we've written 
> and the lines can only start with "fixup" or "squash"

As long as we are internally consistent, I would be happy either way. All code paths that read what we ourselves wrote consistently parse without a space because of the update in this hunk, so the omission of the space check is perfectly OK.

Show 5 quoted lines
> Oswald mentioned in another thread that he'd read these and they
> seemed to make sense. In general I find it hard to attract
> reviewers for rebase/sequencer patches - it is one of those
> features that everyone uses but not many people on the list seem
> to be familiar with the code.

I wonder why that is, though. I would not say it is the most cleanly designed and implemented piece of code, but I do not think it is so bad as to be impossible to read.

>> I will wait for a few more days and then mark the topic for 'next'.
>
> Thanks for your review, I've sent a re-roll fixing the newline detection 
> in the previous patch.
Thanks.
Previous: Phillip WoodNext: Phillip Wood
Message 7 of 10 in “rebase: a couple of fixup fixes”
  1. 0/2 rebase: a couple of fixup fixesPhillip Wood, Jul 17, 2026
  2. 1/2 rebase -i: fix counting of fixups after rebase --skipPhillip Wood, Jul 17, 2026
  3. Junio C HamanoJul 24, 2026
  4. 2/2 rebase: remember fixup -c after skipping fixup/squashPhillip Wood, Jul 17, 2026
  5. Junio C HamanoJul 24, 2026
  6. Phillip WoodJul 26, 2026
  7. Junio C HamanoJul 26, 2026
  8. 0/2 rebase: a couple of fixup fixesPhillip Wood, Jul 26, 2026
  9. 1/2 rebase -i: fix counting of fixups after rebase --skipPhillip Wood, Jul 26, 2026
  10. 2/2 rebase: remember fixup -c after skipping fixup/squashPhillip Wood, Jul 26, 2026

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.