From: Phillip Wood <phillip.wood123@gmail.com>
To: Alex Henrie <alexhenrie24@gmail.com>,
git@vger.kernel.org, tao@klerks.biz, gitster@pobox.com,
newren@gmail.com, phillip.wood123@gmail.com,
Johannes.Schindelin@gmx.de, sorganov@gmail.com,
chooglen@google.com, calvinwan@google.com,
jonathantanmy@google.com, felipe.contreras@gmail.com
Subject: Re: [PATCH v8 3/3] rebase: add a config option for --rebase-merges
Date: Wed, 22 Mar 2023 16:54:49 +0000 [thread overview]
Message-ID: <f062165f-2e59-67b5-ebff-b029c29dd4d6@dunelm.org.uk> (raw)
In-Reply-To: <20230320055955.461138-4-alexhenrie24@gmail.com>
Hi Alex
On 20/03/2023 05:59, Alex Henrie wrote:
> The purpose of the new option is to accommodate users who would like
> --rebase-merges to be on by default and to facilitate turning on
> --rebase-merges by default without configuration in a future version of
> Git.
>
> Name the new option rebase.rebaseMerges, even though it is a little
> redundant, for consistency with the name of the command line option and
> to be clear when scrolling through values in the [rebase] section of
> .gitconfig.
>
> Support setting rebase.rebaseMerges to the nonspecific value "true" for
> users who don't need to or don't want to learn about the difference
> between rebase-cousins and no-rebase-cousins.
>
> Make --rebase-merges without an argument on the command line override
> any value of rebase.rebaseMerges in the configuration, for consistency
> with other command line flags with optional arguments that have an
> associated config option.
Hurray! Thanks for re-rolling. I've left a couple of comments below, I
had hoped this would be the final version but I've realized that the way
you've rearranged the error handling for apply and merge options is not
a good idea (see below). Apart from that I'm happy.
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
> Documentation/config/rebase.txt | 10 ++++
> Documentation/git-rebase.txt | 3 +-
> builtin/rebase.c | 81 ++++++++++++++++++--------
> t/t3422-rebase-incompatible-options.sh | 17 ++++++
> t/t3430-rebase-merges.sh | 34 +++++++++++
> 5 files changed, 121 insertions(+), 24 deletions(-)
>
> diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt
> index f19bd0e040..afaf6dad99 100644
> --- a/Documentation/config/rebase.txt
> +++ b/Documentation/config/rebase.txt
> @@ -67,3 +67,13 @@ rebase.rescheduleFailedExec::
>
> rebase.forkPoint::
> If set to false set `--no-fork-point` option by default.
> +
> +rebase.rebaseMerges::
> + Whether and how to set the `--rebase-merges` option by default. Can
> + be `rebase-cousins`, `no-rebase-cousins`, or a boolean. Setting to
> + true or to `no-rebase-cousins` is equivalent to
> + `--rebase-merges=no-rebase-cousins`, setting to `rebase-cousins` is
> + equivalent to `--rebase-merges=rebase-cousins`, and setting to false is
> + equivalent to `--no-rebase-merges`. Passing `--rebase-merges` on the
> + command line, with or without an argument, overrides any
> + `rebase.rebaseMerges` configuration.
Sounds good
> [...]
> + if (!strcmp(var, "rebase.rebasemerges")) {
> + opts->config_rebase_merges = git_parse_maybe_bool(value);
> + if (opts->config_rebase_merges < 0) {
> + opts->config_rebase_merges = 1;
> + parse_rebase_merges_value(opts, value);
> + } else
> + opts->rebase_cousins = 0;
The "else" clause should have braces because the "if" cause requires
them (see Documentation/CodingGuidelines). I don't think it is worth
re-rolling just for this though.
> [...]
> +static int parse_opt_rebase_merges(const struct option *opt, const char *arg, int unset)
> +{
> + struct rebase_options *options = opt->value;
> +
> + options->rebase_merges = !unset;
> + options->rebase_cousins = 0;
This makes --rebase-merges without an option override
rebase.rebaseMerges - good.
> [...]
> @@ -1514,13 +1542,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> break;
>
> if (i >= 0 || options.type == REBASE_APPLY) {
> - if (is_merge(&options))
> - die(_("apply options and merge options "
> - "cannot be used together"));
This isn't a new change but having thought about it I'm not sure moving
this code is a good idea. If the user runs
git -c rebase.updateRefs=true rebase --whitespace=fix --exec "make test"
then instead of getting an message saying that they cannot use apply and
merge options together they'll get a message suggesting they pass
--no-update-refs which wont fix the problem for them.
> - else if (options.autosquash == -1 && options.config_autosquash == 1)
> + if (options.autosquash == -1 && options.config_autosquash == 1)
> die(_("apply options are incompatible with rebase.autoSquash. Consider adding --no-autosquash"));
> + else if (options.rebase_merges == -1 && options.config_rebase_merges == 1)
> + die(_("apply options are incompatible with rebase.rebaseMerges. Consider adding --no-rebase-merges"));
> else if (options.update_refs == -1 && options.config_update_refs == 1)
> die(_("apply options are incompatible with rebase.updateRefs. Consider adding --no-update-refs"));
> + else if (is_merge(&options))
> + die(_("apply options and merge options "
> + "cannot be used together"));
> else
> options.type = REBASE_APPLY;
> }
Best Wishes
Phillip
next prev parent reply other threads:[~2023-03-22 16:55 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-23 5:34 [PATCH v4 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-02-23 5:34 ` [PATCH v4 2/3] rebase: stop accepting --rebase-merges="" Alex Henrie
2023-02-24 13:54 ` Johannes Schindelin
2023-02-24 17:20 ` Junio C Hamano
2023-02-24 17:50 ` Alex Henrie
2023-02-24 18:08 ` Junio C Hamano
2023-02-24 18:23 ` Alex Henrie
2023-02-24 18:40 ` Junio C Hamano
2023-02-24 18:55 ` Alex Henrie
2023-02-24 19:13 ` Junio C Hamano
2023-02-24 19:24 ` Alex Henrie
2023-02-24 19:24 ` Phillip Wood
2023-02-24 19:56 ` Alex Henrie
2023-02-23 5:34 ` [PATCH v4 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-02-24 13:53 ` Johannes Schindelin
2023-02-24 17:49 ` Alex Henrie
2023-02-24 14:55 ` Phillip Wood
2023-02-24 17:51 ` Alex Henrie
2023-02-23 17:28 ` [PATCH v4 1/3] rebase: add documentation and test for --no-rebase-merges Junio C Hamano
2023-02-24 13:57 ` Johannes Schindelin
2023-02-24 19:16 ` Junio C Hamano
2023-02-25 18:09 ` Alex Henrie
2023-02-25 18:03 ` [PATCH v5 0/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-02-25 18:03 ` [PATCH v5 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-01 23:23 ` Glen Choo
2023-02-25 18:03 ` [PATCH v5 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-01 23:46 ` Glen Choo
2023-03-02 10:07 ` Phillip Wood
2023-03-02 18:02 ` Calvin Wan
2023-02-25 18:03 ` [PATCH v5 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-01 23:43 ` Glen Choo
2023-03-02 9:37 ` Phillip Wood
2023-03-04 23:24 ` Alex Henrie
2023-03-07 16:23 ` Phillip Wood
2023-03-12 20:57 ` Alex Henrie
2023-03-13 14:20 ` Phillip Wood
2023-03-13 16:12 ` Felipe Contreras
2023-03-13 19:46 ` Junio C Hamano
2023-03-24 14:47 ` About replaying "evil" merges... " Johannes Schindelin
2023-03-02 18:02 ` Calvin Wan
2023-03-04 23:24 ` Alex Henrie
2023-03-01 23:14 ` [PATCH v5 0/3] " Glen Choo
2023-03-02 5:02 ` Alex Henrie
2023-03-02 5:09 ` Alex Henrie
2023-03-05 5:07 ` [PATCH v6 0/3] rebase: document, clean up, and introduce " Alex Henrie
2023-03-05 5:07 ` [PATCH v6 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-08 22:25 ` Sergey Organov
2023-03-05 5:07 ` [PATCH v6 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-07 14:59 ` Phillip Wood
2023-03-05 5:07 ` [PATCH v6 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-07 14:56 ` Phillip Wood
2023-03-07 18:32 ` Junio C Hamano
2023-03-12 21:01 ` Alex Henrie
2023-03-08 0:09 ` Glen Choo
2023-03-08 0:02 ` Glen Choo
2023-03-12 21:03 ` Alex Henrie
2023-03-15 2:52 ` Alex Henrie
2023-03-16 17:32 ` Glen Choo
2023-03-16 18:11 ` Felipe Contreras
2023-03-16 22:46 ` Glen Choo
2023-03-16 23:48 ` Felipe Contreras
2023-03-16 20:27 ` Alex Henrie
2023-03-16 22:39 ` Glen Choo
2023-03-18 5:59 ` Alex Henrie
2023-03-24 15:05 ` Johannes Schindelin
2023-03-25 16:59 ` Sergey Organov
2023-03-05 12:22 ` [PATCH v6 0/3] rebase: document, clean up, and introduce " Sergey Organov
2023-03-05 21:33 ` Alex Henrie
2023-03-05 22:54 ` Sergey Organov
2023-03-06 0:02 ` Alex Henrie
2023-03-06 13:23 ` Sergey Organov
2023-03-06 19:08 ` Junio C Hamano
2023-03-06 17:19 ` Junio C Hamano
2023-03-06 16:24 ` Phillip Wood
2023-03-06 17:36 ` Alex Henrie
2023-03-07 15:07 ` Phillip Wood
2023-03-08 0:13 ` Glen Choo
2023-03-12 21:04 ` [PATCH v7 " Alex Henrie
2023-03-12 21:04 ` [PATCH v7 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-12 21:04 ` [PATCH v7 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-12 21:04 ` [PATCH v7 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-20 5:59 ` [PATCH v8 0/3] rebase: document, clean up, and introduce " Alex Henrie
2023-03-20 5:59 ` [PATCH v8 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-20 5:59 ` [PATCH v8 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-20 5:59 ` [PATCH v8 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-22 16:54 ` Phillip Wood [this message]
2023-03-23 18:45 ` Junio C Hamano
2023-03-24 14:52 ` Phillip Wood
2023-03-25 5:23 ` Alex Henrie
2023-03-25 5:21 ` Alex Henrie
2023-03-26 3:06 ` [PATCH v9 0/3] rebase: document, clean up, and introduce " Alex Henrie
2023-03-26 3:06 ` [PATCH v9 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-26 3:06 ` [PATCH v9 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-26 3:06 ` [PATCH v9 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-26 15:12 ` [PATCH v9 0/3] rebase: document, clean up, and introduce " Phillip Wood
2023-03-27 16:33 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f062165f-2e59-67b5-ebff-b029c29dd4d6@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alexhenrie24@gmail.com \
--cc=calvinwan@google.com \
--cc=chooglen@google.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sorganov@gmail.com \
--cc=tao@klerks.biz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).