kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

rebase: move incompatibility checks between backend options a bit earlier 

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2020-02-15 21:36:33 +00:00 committed by Junio C Hamano
parent be50c938df
commit 8af14f0859
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/rebase.c
View File

@ -1878,6 +1878,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (isatty(2) && options.flags & REBASE_NO_QUIET) if (isatty(2) && options.flags & REBASE_NO_QUIET)
strbuf_addstr(&options.git_format_patch_opt, " --progress"); strbuf_addstr(&options.git_format_patch_opt, " --progress");


if (options.git_am_opts.argc) {
/* all am options except -q are compatible only with --am */
for (i = options.git_am_opts.argc - 1; i >= 0; i--)
if (strcmp(options.git_am_opts.argv[i], "-q"))
break;

if (is_interactive(&options) && i >= 0)
die(_("cannot combine am options with either "
"interactive or merge options"));
}

switch (options.type) { switch (options.type) {
case REBASE_MERGE: case REBASE_MERGE:
case REBASE_INTERACTIVE: case REBASE_INTERACTIVE:
@ -1908,17 +1919,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (reschedule_failed_exec >= 0) if (reschedule_failed_exec >= 0)
options.reschedule_failed_exec = reschedule_failed_exec; options.reschedule_failed_exec = reschedule_failed_exec;


if (options.git_am_opts.argc) {
/* all am options except -q are compatible only with --am */
for (i = options.git_am_opts.argc - 1; i >= 0; i--)
if (strcmp(options.git_am_opts.argv[i], "-q"))
break;

if (is_interactive(&options) && i >= 0)
die(_("cannot combine am options with either "
"interactive or merge options"));
}

if (options.signoff) { if (options.signoff) {
if (options.type == REBASE_PRESERVE_MERGES) if (options.type == REBASE_PRESERVE_MERGES)
die("cannot combine '--signoff' with " die("cannot combine '--signoff' with "