From: Philip Oakley <philipoakley@iee.email>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Philip Oakley via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/3] rebase: note `preserve` merges may be a pull config option
Date: Thu, 26 May 2022 13:01:04 +0100 [thread overview]
Message-ID: <1e7dd39e-0491-e561-be1f-7666fcf62bc6@iee.email> (raw)
In-Reply-To: <220526.8635gw7has.gmgdl@evledraar.gmail.com>
hi,
On 26/05/2022 10:50, Ævar Arnfjörð Bjarmason wrote:
> On Thu, May 26 2022, Philip Oakley via GitGitGadget wrote:
>
>> From: Philip Oakley <philipoakley@iee.email>
>>
>> The `--preserve-merges` option was removed by v2.35.0. However
>> users may not be aware that it is also a Pull option, and it is
>> still offered by major IDE vendors such as Visual Studio.
>>
>> Extend the `--preserve-merges` die message to also direct users to
>> the use of the `preserve` option in the `pull` config.
>>
>> Signed-off-by: Philip Oakley <philipoakley@iee.email>
>> ---
>> builtin/rebase.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/builtin/rebase.c b/builtin/rebase.c
>> index aada25a8870..6fc0aaebbb8 100644
>> --- a/builtin/rebase.c
>> +++ b/builtin/rebase.c
>> @@ -1205,7 +1205,8 @@ 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"
>> + "Your `pull` configuration, may also invoke this option."));
>>
>> if (action != ACTION_NONE && total_argc != 2) {
>> usage_with_options(builtin_rebase_usage,
> Ditto 2/3 about maybe die_message() + advise().
I'm not that enamoured about hiding die message details behind an advice
option. In this case it not meant to be a regular reminder type thing,
rather a one-off fix-it-forever sort of `advice'. At least that my
reasoning.
> In this case that has
> the slight advantace of allowing us to keep the existing translated
> string as-is.
>
> But also, is *our* pull configuration causing us to end up here?
Yes, but. The extra message is about fixing all places that the user may
have setup a config for using preserve-merges, not just here. The fact
that IDEs offer a menu for adding that setting makes it easy for users
to get into this.
I'd agree that pull already has detection for this, but I was looking to
avoid the 'fool me once, fool me twice' scenarios.
It could be dropped if thought over zealous.
> I
> vaguely recall that being discussed (probably in answer to a question of
> mine) in the earlier round, or is this the IDE picking it up & invoking
> us like this?
>
next prev parent reply other threads:[~2022-05-26 12:01 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 [this message]
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
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=1e7dd39e-0491-e561-be1f-7666fcf62bc6@iee.email \
--to=philipoakley@iee.email \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/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).