git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Philip Oakley <philipoakley@iee.email>
To: Junio C Hamano <gitster@pobox.com>,
	Philip Oakley via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option
Date: Sat, 11 Jun 2022 16:38:20 +0100	[thread overview]
Message-ID: <3800fa9c-50b4-2967-2f00-036c1edf5e52@iee.email> (raw)
In-Reply-To: <4cac8a13-a075-544e-8c10-e58bbf0dd73d@iee.email>

small clarification,

On 11/06/2022 15:03, Philip Oakley wrote:
>> 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.
> From my perspective, users should then

That is, when users hit any of the `preserve-merges` error message, ... 
>  be purging _all_ their `preserve`
> configurations once they hit such errors. As the v2.34.0 change
> propagates through the Git ecosystem, hopefully it'll be a sufficient
> prompt for those who haven't realised that the option can be 'hidden' in
> their configuration options.


  reply	other threads:[~2022-06-11 15:38 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
2022-06-11 14:03       ` Philip Oakley
2022-06-11 15:38         ` Philip Oakley [this message]
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

  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=3800fa9c-50b4-2967-2f00-036c1edf5e52@iee.email \
    --to=philipoakley@iee.email \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=l.s.r@web.de \
    /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).