Git development
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Harald Nordgren <haraldnordgren@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Cc: Harald Nordgren via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org
Subject: Re: [PATCH] rebase: mention --abort alongside --continue
Date: Thu, 16 Jul 2026 10:37:22 +0100	[thread overview]
Message-ID: <4d150f21-46ea-4bf7-b516-c1763c152b34@gmail.com> (raw)
In-Reply-To: <CAHwyqnVy=4oHBTmtDJ6jX38Kh1aLYYXHR-_12DdiiUxpXZ5kNg@mail.gmail.com>

Hi Harald

On 16/07/2026 07:02, Harald Nordgren wrote:
> I'll revive this discussion because the 'git rebase --keep-base -x'
> case still bothers me.
> 
> When getting stuck in the middle of an operation, it just makes sense
> to offer a way forward and a way back, why be more obtuse than we need
> to?

I'm still not clear why you'd want to abort after a failed exec. In the 
example you gave earlier in the thread where the exec command was trying 
to run a command that did not exist isn't the solution to edit the todo 
list to fix that, or if just this exec command is wrong, continue the 
rebase?

In the latter case it would  be useful is to teach "git rebase --skip" 
to skip a failed exec command that has been rescheduled by 
"--reschedule-failed-exec" and provide a hint to the user that they can 
skip the rescheduled command. We could potentially add a hint to suggest 
that if the failure was due to a bad command then the user should edit 
the todo list.

To me aborting a rebase because an exec command failed is almost never a 
sensible route forward and we should not be encouraging users to abort 
after a failed test - surely the sensible thing to do in that case is 
fix the problem with "git commit --amend" and continue the rebase.

Thanks

Phillip


  reply	other threads:[~2026-07-16  9:37 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-15 19:19 [PATCH] rebase: mention --abort alongside --continue Harald Nordgren via GitGitGadget
2026-06-16  8:36 ` Phillip Wood
2026-06-16 17:33   ` Junio C Hamano
2026-06-17  8:56     ` Harald Nordgren
2026-06-17  9:52     ` Phillip Wood
2026-06-17 12:19       ` Junio C Hamano
2026-06-18 18:49         ` Harald Nordgren
2026-06-19  1:36           ` Junio C Hamano
2026-07-16  6:02             ` Harald Nordgren
2026-07-16  9:37               ` Phillip Wood [this message]
2026-07-16 17:24                 ` Junio C Hamano

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=4d150f21-46ea-4bf7-b516-c1763c152b34@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=haraldnordgren@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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