rebase: mark --update-refs as requiring the merge backend

--update-refs is built in terms of the sequencer, which requires the
merge backend.  It was already marked as incompatible with the apply
backend in the git-rebase manual, but the code didn't check for this
incompatibility and warn the user.  Check and error now.

While at it, fix a typo in t3422...and fix some misleading wording
(most options which used to be am-specific have since been implemented
in the merge backend as well).

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2023-01-25 04:03:45 +00:00
committed by Junio C Hamano
parent 56c8fb1e95
commit 1207599e83
3 changed files with 15 additions and 5 deletions

View File

@ -1492,6 +1492,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
}
}
if (options.update_refs)
imply_merge(&options, "--update-refs");
if (options.type == REBASE_UNSPECIFIED) {
if (!strcmp(options.default_backend, "merge"))
imply_merge(&options, "--merge");