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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.7 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_MED, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id C5D991F9F4 for ; Wed, 1 Sep 2021 11:57:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243947AbhIAL6U (ORCPT ); Wed, 1 Sep 2021 07:58:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243927AbhIAL6S (ORCPT ); Wed, 1 Sep 2021 07:58:18 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 093E8C061760 for ; Wed, 1 Sep 2021 04:57:21 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id q11so4064318wrr.9 for ; Wed, 01 Sep 2021 04:57:20 -0700 (PDT) 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=QV2NH/ueGnG2UZscbLTUIc7Ecyk1FKUygP0zfzxTiQg=; b=iFRihvRY//8O2zZiZReH1wEcrOatR/EWEbAR4aEHoAXxM49BLVWWPiA8PIJJotmLwc 2yYKzYGxpJFZ8Ts5zPdFq/L7xouu3dGs9sLuvSUUvca1Z11UyNkxeajtXPfM5EqXoBl/ 0SnQx8KBSwDPyVOn8wBet2CswBLzp6Y6dCPVDT7Y96RShlIvDi1AxQ1aqyXhPu0nKSEa t1YpCiLZkSGVo8jGWRiY+/YkVCnuvM+eXZu0SGxbLjxU2GaILOfqI9qn7W6QAOEhLG1O 5Jb8ZctRfESNn0QXueeIsNouSGa7essjNgWIlWCl+Vl4OjvC4f3mQcfx2/yb/N+9K1BJ rJHw== 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=QV2NH/ueGnG2UZscbLTUIc7Ecyk1FKUygP0zfzxTiQg=; b=SPwtmj08ZwdMA+5hcVuahqvXB3ozTiKDIX55uyxupHhM8PFkZ/6m19BmiVmsf6By1v ocj4QT9NGu4CuQlhZyZXSDXMRZjV/bBO4Rjc/xF8PCq94TcCP0UWakoPLBZc2qg6jI4U cHuxlCmprkAuvy5J5eL+S6QyfzPhqQlIZgGFyo7VcIC7TUPCr8HjqL4ieQup0rZ/ymI6 jjDdsocPEB09mTbFzMdn6NiGMswGPqvL90cStXlagYpV8Xz1heRmf1Nq/LOm7z4TONey kAAe8FBL8CNR2qAC6K+qHJGnvDAuhA2GV4sefiKD7urxYURl+5G1H8GVCX5bO7BypyJk zl7Q== X-Gm-Message-State: AOAM530/VXsyadmnfh0ggBGimWP1SIlLaq3fuWkCM2foxC1+xmqMZJoj AmYvf/yOuF4HdZgRwgTYM55et2P1U34= X-Google-Smtp-Source: ABdhPJznlsqCN69YNd/eLzUuuj4tfqwnDCg7kSQUv7X9g1y7nRE0qly5wb7Db7ljSXMHlCpJcX2Wkw== X-Received: by 2002:a5d:6cca:: with SMTP id c10mr18137458wrc.224.1630497439679; Wed, 01 Sep 2021 04:57:19 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x11sm2110411wmk.21.2021.09.01.04.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 04:57:19 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Wed, 01 Sep 2021 11:57:11 +0000 Subject: [PATCH v2 4/7] pull: remove support for `--rebase=preserve` Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Eric Wong , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin In preparation for `git-rebase--preserve-merges.sh` entering its after life, we remove this (deprecated) option that would still rely on it. Signed-off-by: Johannes Schindelin --- Documentation/config/branch.txt | 4 ---- Documentation/config/pull.txt | 4 ---- Documentation/git-pull.txt | 6 +----- builtin/pull.c | 9 +++------ contrib/completion/git-completion.bash | 2 +- rebase.c | 2 -- rebase.h | 1 - 7 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt index cc5f3249fc5..d323d7327f6 100644 --- a/Documentation/config/branch.txt +++ b/Documentation/config/branch.txt @@ -85,10 +85,6 @@ When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase' so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When `preserve` (or just 'p', deprecated in favor of `merges`), also pass -`--preserve-merges` along to 'git rebase' so that locally committed merge -commits will not be flattened by running 'git pull'. -+ When the value is `interactive` (or just 'i'), the rebase is run in interactive mode. + diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt index 54048306095..9349e09261b 100644 --- a/Documentation/config/pull.txt +++ b/Documentation/config/pull.txt @@ -18,10 +18,6 @@ When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase' so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When `preserve` (or just 'p', deprecated in favor of `merges`), also pass -`--preserve-merges` along to 'git rebase' so that locally committed merge -commits will not be flattened by running 'git pull'. -+ When the value is `interactive` (or just 'i'), the rebase is run in interactive mode. + diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 7f4b2d1982e..7144690a0cb 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -102,7 +102,7 @@ Options related to merging include::merge-options.txt[] -r:: ---rebase[=false|true|merges|preserve|interactive]:: +--rebase[=false|true|merges|interactive]:: When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch @@ -113,10 +113,6 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When set to `preserve` (deprecated in favor of `merges`), rebase with the -`--preserve-merges` option passed to `git rebase` so that locally created -merge commits will not be flattened. -+ When false, merge the upstream branch into the current branch. + When `interactive`, enable the interactive mode of rebase. diff --git a/builtin/pull.c b/builtin/pull.c index 3e13f810843..bda5c32ab6f 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -30,9 +30,8 @@ /** * Parses the value of --rebase. If value is a false value, returns * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is - * "merges", returns REBASE_MERGES. If value is "preserve", returns - * REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if - * fatal is true, otherwise returns REBASE_INVALID. + * "merges", returns REBASE_MERGES. If value is a invalid value, dies with + * a fatal error if fatal is true, otherwise returns REBASE_INVALID. */ static enum rebase_type parse_config_rebase(const char *key, const char *value, int fatal) @@ -126,7 +125,7 @@ static struct option pull_options[] = { /* Options passed to git-merge or git-rebase */ OPT_GROUP(N_("Options related to merging")), OPT_CALLBACK_F('r', "rebase", &opt_rebase, - "(false|true|merges|preserve|interactive)", + "(false|true|merges|interactive)", N_("incorporate changes by rebasing rather than merging"), PARSE_OPT_OPTARG, parse_opt_rebase), OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL, @@ -883,8 +882,6 @@ static int run_rebase(const struct object_id *newbase, /* Options passed to git-rebase */ if (opt_rebase == REBASE_MERGES) strvec_push(&args, "--rebase-merges"); - else if (opt_rebase == REBASE_PRESERVE) - strvec_push(&args, "--preserve-merges"); else if (opt_rebase == REBASE_INTERACTIVE) strvec_push(&args, "--interactive"); if (opt_diffstat) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4bdd27ddc87..5dab8bd579e 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2543,7 +2543,7 @@ __git_complete_config_variable_value () return ;; branch.*.rebase) - __gitcomp "false true merges preserve interactive" "" "$cur_" + __gitcomp "false true merges interactive" "" "$cur_" return ;; remote.pushdefault) diff --git a/rebase.c b/rebase.c index f8137d859b5..877c068687c 100644 --- a/rebase.c +++ b/rebase.c @@ -20,8 +20,6 @@ enum rebase_type rebase_parse_value(const char *value) return REBASE_FALSE; else if (v > 0) return REBASE_TRUE; - else if (!strcmp(value, "preserve") || !strcmp(value, "p")) - return REBASE_PRESERVE; else if (!strcmp(value, "merges") || !strcmp(value, "m")) return REBASE_MERGES; else if (!strcmp(value, "interactive") || !strcmp(value, "i")) diff --git a/rebase.h b/rebase.h index cc723d47489..203b4372823 100644 --- a/rebase.h +++ b/rebase.h @@ -5,7 +5,6 @@ enum rebase_type { REBASE_INVALID = -1, REBASE_FALSE = 0, REBASE_TRUE, - REBASE_PRESERVE, REBASE_MERGES, REBASE_INTERACTIVE }; -- gitgitgadget