On Thu, May 26 2022, Philip Oakley via GitGitGadget wrote: > From: Philip Oakley <philipoakley@iee.email> > > Git will die if a "rebase --preserve-merges" is in progress. > Users cannot --quit, --abort or --continue the rebase. > > Make the `rebase --abort` option available to allow users to remove > traces of any preserve-merges rebase, even if they had upgraded > during a rebase. > > One trigger was an unexpectedly difficult to resolve conflict, as > reported on the `git-users` group. > (https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM) > > Tell the user the options to resolve the problem manually. > > Signed-off-by: Philip Oakley <philipoakley@iee.email> > --- > builtin/rebase.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index 6ce7e98a6f1..aada25a8870 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -1182,8 +1182,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > } else if (is_directory(merge_dir())) { > strbuf_reset(&buf); > strbuf_addf(&buf, "%s/rewritten", merge_dir()); > - if (is_directory(buf.buf)) { > - die("`rebase -p` is no longer supported"); > + if (is_directory(buf.buf) && !(action == ACTION_ABORT)) { > + die("`rebase --preserve-merges` (-p) is no longer supported.\n" > + "Use `git rebase --abort` to terminate current rebase.\n" > + "Or downgrade to v2.33, or earlier, to complete the rebase.\n"); > } else { > strbuf_reset(&buf); > strbuf_addf(&buf, "%s/interactive", merge_dir()); Existing issue: No _(), shouldn't we add it? I wonder if we should use die_message() + advise() in these cases, i.e. stick to why we died in die_message() and have the advise() make suggestions, as e4921d877ab (tracking branches: add advice to ambiguous refspec error, 2022-04-01) does. But then again adding new advice is currently a bit of an excercise in boilerplate, and this seems fine for a transitory option. I think you don't need to add a trailing \n though...
