diff options
| author | Elijah Newren <newren@gmail.com> | 2023-01-25 05:03:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 18:20:52 +0100 |
| commit | 1207599e839bd9311ec506d82cd507e820767e9b (patch) | |
| tree | 9ff639d6d6af53691a9c929bcd81b13ec212f42c /builtin/rebase.c | |
| parent | The ninth batch (diff) | |
| download | git-1207599e839bd9311ec506d82cd507e820767e9b.tar.xz git-1207599e839bd9311ec506d82cd507e820767e9b.zip | |
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>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index a26cc0cfdb..c111b89e13 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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"); |