From: Junio C Hamano <gitster@pobox•com>
To: "Øystein Walle" <oystwa@gmail•com>
Cc: git@vger•kernel.org, phillip.wood123@gmail•com
Subject: Re: [PATCH v2] rebase: write script before initializing state
Date: Wed, 23 Jul 2025 14:34:36 -0700 [thread overview]
Message-ID: <xmqq1pq6mw0j.fsf@gitster.g> (raw)
In-Reply-To: <20250711203615.9982-1-oystwa@gmail.com> ("Øystein Walle"'s message of "Fri, 11 Jul 2025 22:36:15 +0200")
Øystein Walle <oystwa@gmail•com> writes:
> 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.
prev parent reply other threads:[~2025-07-23 21:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-09 22:10 [PATCH] rebase: write script before initializing state Øystein Walle
2025-06-09 23:03 ` Junio C Hamano
2025-06-10 10:13 ` Phillip Wood
2025-07-09 0:14 ` Junio C Hamano
2025-07-11 20:36 ` [PATCH v2] " Øystein Walle
2025-07-11 21:25 ` Junio C Hamano
2025-07-24 14:22 ` Phillip Wood
2025-07-23 21:34 ` Junio C Hamano [this message]
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=xmqq1pq6mw0j.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=oystwa@gmail$(echo .)com \
--cc=phillip.wood123@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox