diff options
| author | Philip Oakley <philipoakley@iee.email> | 2022-06-04 11:17:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-06 10:45:54 -0700 |
| commit | afd58a0d42b5385089799fdd66b555df7cc8a4b4 (patch) | |
| tree | 27331ef9664372b1c925414d8a11c17ecf60ddea | |
| parent | rebase.c: state preserve-merges has been removed (diff) | |
| download | git-afd58a0d42b5385089799fdd66b555df7cc8a4b4.tar.gz git-afd58a0d42b5385089799fdd66b555df7cc8a4b4.zip | |
rebase: help users when dying with `preserve-merges`
Git would die if a "rebase --preserve-merges" was in progress.
Users could neither --quit, --abort, nor --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 case was an unexpectedly difficult to resolve conflict, as
reported on the `git-users` group.
(https://groups.google.com/g/git-for-windows/c/3jMWbBlXXHM)
Other potential use-cases include git-experts using the portable
'Git on a stick' to help users with an older git version.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/rebase.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 7c1b9bd9b9..a3bae89f64 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 (!(action == ACTION_ABORT) && is_directory(buf.buf)) { + 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."); } else { strbuf_reset(&buf); strbuf_addf(&buf, "%s/interactive", merge_dir()); |