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

Re: [PATCH v2] rebase: write script before initializing state

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 23, 2025, 21:34 UTC
Message-ID
<xmqq1pq6mw0j.fsf@gitster.g>
In-Reply-To
<20250711203615.9982-1-oystwa@gmail.com>
Øystein Walle <oystwa@gmail.com> writes:
Show 34 quoted lines
> If rebase.instructionFormat is invalid the repository is left in a
> strange state when the interactive rebase fails. `git status` outputs
> both the same as it would have in the normal case *and* something
> related to the interactive rebase:
>
>     $ git -c rebase.instructionFormat=blah rebase -i
>     fatal: invalid --pretty format: blah
>     $ git status
>     On branch master
>     Your branch is ahead of 'upstream/master' by 1 commit.
>       (use "git push" to publish your local commits)
>
>     git-rebase-todo is missing.
>     No commands done.
>     No commands remaining.
>     You are currently editing a commit while rebasing branch 'master' on '8db3019401'.
>       (use "git commit --amend" to amend the current commit)
>       (use "git rebase --continue" once you are satisfied with your changes)
>
> get_commit_format() calls die() on failure so we cannot handle the error
> gracefully. By attempting to write the rebase script before initializing
> the state this bad state can be avoided.
>
> Signed-off-by: Øystein Walle <oystwa@gmail.com>
> ---
> So sorry for the delay. I saw that the signoff was missing, then saw
> Phillip's review, decided to think about it and then life happened in
> the mean time...
>
> This patch is identical to the first one except it has the missing
> signoff and a few typos in the commit message corrected. Phillip's
> suggestions are noted and appreciated but unfortunately I am unable to
> work on the at the moment. And I do think my patch is at least an
> improvement albeit perhaps less thorough than it could have been.

I am sweeping my backlog and noticed that nobody chimed in to help improving this topic. As I already said, this would not least be moving a step in the right direction, so I am planning to mark it for 'next', but thought that I should check first before doing so, in case you are back on the topic and cooking a new iteration.

Thanks.
Previous: Phillip Wood
Message 8 of 8 in “rebase: write script before initializing state”
  1. rebase: write script before initializing stateØystein Walle, Jun 9, 2025
  2. Junio C HamanoJun 9, 2025
  3. Phillip WoodJun 10, 2025
  4. Junio C HamanoJul 9, 2025
  5. rebase: write script before initializing stateØystein Walle, Jul 11, 2025
  6. Junio C HamanoJul 11, 2025
  7. Phillip WoodJul 24, 2025
  8. Junio C HamanoJul 23, 2025

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.