From: Junio C Hamano <gitster@pobox.com>
To: "Philip Oakley via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Philip Oakley" <philipoakley@iee.email>,
"René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option
Date: Mon, 06 Jun 2022 10:57:33 -0700 [thread overview]
Message-ID: <xmqq1qw18yk2.fsf@gitster.g> (raw)
In-Reply-To: <fe000f062078e544361c87c319830cd36aabbc91.1654341469.git.gitgitgadget@gmail.com> (Philip Oakley via GitGitGadget's message of "Sat, 04 Jun 2022 11:17:48 +0000")
"Philip Oakley via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Philip Oakley <philipoakley@iee.email>
>
> The `--preserve-merges` option was removed by v2.34.0. However
> users may not be aware that it is also a Pull configuration option,
> which is still offered by major IDE vendors such as Visual Studio.
>
> Extend the `--preserve-merges` die message to also direct users to
> the possible use of the `preserve` option in the `pull.rebase` config.
> This is an additional 'belt and braces' information statement.
>
> Signed-off-by: Philip Oakley <philipoakley@iee.email>
> ---
> builtin/rebase.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 17cc776b4b1..5f8921551e1 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1205,7 +1205,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> builtin_rebase_usage, 0);
>
> if (preserve_merges_selected)
> - die(_("--preserve-merges was replaced by --rebase-merges"));
> + die(_("--preserve-merges was replaced by --rebase-merges\n"
> + "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
> + "which is no longer supported; use 'merges' instead"));
"be set" -> "be set".
I am not sure how this helps anybody, though.
When pull.rebase is parsed, rebase.c::rebase_parse_value() is called
from builtin/pull.c::parse_config_rebase() and would trigger an
error, whether it comes from the pull.rebase or the branch.*.rebase
configuration variable. An error() message already said that
'preserve' was removed and 'merges' would be a replacement when it
happened.
If the user has *not* reached this die() due to a configuration
variable, then there is not much point giving this new message,
either.
next prev parent reply other threads:[~2022-06-06 17:57 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-26 9:21 [PATCH 0/3] Die preserve ggg Philip Oakley via GitGitGadget
2022-05-26 9:21 ` [PATCH 1/3] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-05-26 9:40 ` Ævar Arnfjörð Bjarmason
2022-05-26 11:40 ` Philip Oakley
2022-05-26 13:02 ` René Scharfe
2022-05-26 20:33 ` Junio C Hamano
2022-05-26 21:27 ` René Scharfe
2022-05-26 23:23 ` Junio C Hamano
2022-05-27 12:35 ` Philip Oakley
2022-05-27 12:17 ` Philip Oakley
2022-05-27 15:45 ` Junio C Hamano
2022-05-27 12:12 ` Philip Oakley
2022-05-27 12:34 ` Ævar Arnfjörð Bjarmason
2022-05-26 9:21 ` [PATCH 2/3] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-05-26 9:43 ` Ævar Arnfjörð Bjarmason
2022-05-26 11:44 ` Philip Oakley
2022-05-26 20:42 ` Junio C Hamano
2022-05-27 12:58 ` Philip Oakley
2022-05-27 15:54 ` Junio C Hamano
2022-05-26 9:21 ` [PATCH 3/3] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-05-26 9:50 ` Ævar Arnfjörð Bjarmason
2022-05-26 12:01 ` Philip Oakley
2022-05-26 20:55 ` Junio C Hamano
2022-05-27 12:08 ` Philip Oakley
2022-05-26 9:54 ` [PATCH 0/3] Die preserve ggg Ævar Arnfjörð Bjarmason
2022-05-26 12:57 ` Philip Oakley
2022-06-04 11:17 ` [PATCH v2 0/4] " Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 1/4] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 2/4] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-06-04 11:17 ` [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-06-06 17:57 ` Junio C Hamano [this message]
2022-06-11 14:03 ` Philip Oakley
2022-06-11 15:38 ` Philip Oakley
2022-06-11 19:22 ` Junio C Hamano
2022-06-04 11:17 ` [PATCH v2 4/4] rebase: translate a die(preserve-merges) message Philip Oakley via GitGitGadget
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq1qw18yk2.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=l.s.r@web.de \
--cc=philipoakley@iee.email \
/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.
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 NNTP newsgroup(s).