From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id D2A701F45E for ; Sat, 15 Feb 2020 21:36:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727868AbgBOVg6 (ORCPT ); Sat, 15 Feb 2020 16:36:58 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53296 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727785AbgBOVgy (ORCPT ); Sat, 15 Feb 2020 16:36:54 -0500 Received: by mail-wm1-f65.google.com with SMTP id s10so13526272wmh.3 for ; Sat, 15 Feb 2020 13:36:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=jBHnPqPC6gfu7bSIASbl8Avw7/lF+yCz5kqVQfLGBWk=; b=RLZIi2LxHxvdZsPwZcmhQE7ZTmN3hgBKpbuw0137Q/JmVetUIArfCsrqotDur/JD3X h4Oh0b4PpxubA/sztVG5OnhRsV7clvDkSGlEUbzqWNgAfEFYACVi/BbDbw6YaPexDfq9 hgbncnyiH0GsZxBwYlgb/jObVYmbiAc9xfnxVIFRbe+6jzXy0prr/xurYXAIbsHEoA2t mNzRWq0cpa3Fds0lZCWmIrjOV+G+astjzlA1l9YSVC8LuYv5fr3bWxG50HFZH+Y7fX1A 81a2P9pYMSF3kqC+x8jSlV52VvmC9vlkcSUbyGURO9ZnDNVQqt391+1aKHOLyiNru6VW bRLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=jBHnPqPC6gfu7bSIASbl8Avw7/lF+yCz5kqVQfLGBWk=; b=lJUu9l/3Z4D/+Wsox5LCHZux+CIt53jY1tyhWzxkEeynst3XIXyFPLru3siyfGTPge vceyHdBoOzvyupPvKYFRswzdfH0ay0dK2fljW6lgbLBQ7bVkJxtb3NoVm66qvEgbJDs9 aOrHFuv2MMPTr8XjtSKk3FML2grgC0nyYk/YrRDzJfijkiEq2798TeoyP1hHz1Wej804 B5Kym1J0sUSnlCu7d50unmglY+gbRnwR/F3srjoGYe5ID8PIt3G4FdbsAaOrzzL7+KjR iFnXkhRy4ZaCMkEP83fjArBQzVdjej1uBqX0HTpxf8Hc+mH8dfbkUUkOK+VVTuUegDK1 PuRQ== X-Gm-Message-State: APjAAAXCx5sm9cdVcXJSKVEt/aQ7o59WF7JgivAwOKN1x1PF6pwmTylL 6XuIiR/fKPdW5VjWXM1b6sIq8EJw X-Google-Smtp-Source: APXvYqxfvVR7bLo6US5X3GkSs5TaWPpecKZo2x69hx/yh8UKDH25sVDG0gsfAZc5qK0XS439Ew0TCw== X-Received: by 2002:a7b:c1da:: with SMTP id a26mr13030800wmj.155.1581802612320; Sat, 15 Feb 2020 13:36:52 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c15sm13121557wrt.1.2020.02.15.13.36.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Feb 2020 13:36:51 -0800 (PST) Message-Id: <0c921919dcee49e90825e1f42177ce58f8b3eb5f.1581802602.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Sat, 15 Feb 2020 21:36:33 +0000 Subject: [PATCH v5 12/20] rebase: move incompatibility checks between backend options a bit earlier Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes.Schindelin@gmx.de, phillip.wood@dunelm.org.uk, liu.denton@gmail.com, gitster@pobox.com, plroskin@gmail.com, alban.gruin@gmail.com, szeder.dev@gmail.com, jrnieder@gmail.com, emilyshaffer@google.com, Elijah Newren , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Signed-off-by: Elijah Newren --- builtin/rebase.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 6e9a2fedc7f..a2f05f783d8 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1878,6 +1878,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (isatty(2) && options.flags & REBASE_NO_QUIET) 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) { case REBASE_MERGE: case REBASE_INTERACTIVE: @@ -1908,17 +1919,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (reschedule_failed_exec >= 0) 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.type == REBASE_PRESERVE_MERGES) die("cannot combine '--signoff' with " -- gitgitgadget