From: Ben Boeckel <mathstuf@gmail•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH v1 0/4] advice: remove usage of `advice_*` global variables
Date: Mon, 2 Aug 2021 20:45:36 -0400 [thread overview]
Message-ID: <YQiRsEzF8psNTqRR@erythro.dev.benboeckel.internal> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2108030009330.55@tvgsbejvaqbjf.bet>
On Tue, Aug 03, 2021 at 00:15:06 +0200, Johannes Schindelin wrote:
> On Fri, 30 Jul 2021, Ben Boeckel wrote:
> > When looking at global variable usage for my `branch.default*` settings,
> > I found the `advice_` variables which were simple enough to resolve.
>
> Even better, it concludes the journey started in c4a09cc9ccb (Merge branch
> 'hw/advise-ng', 2020-03-25).
>
> I reviewed the entire series and left a few comments I believe to be
> constructive.
Thanks, they've been helpful. I'll work on updating my topic in the
coming days.
> Since patch 2/4 resolves a problem introduced by merging divergent changes
> (one adding `advice_settings`, the other adding two entries to
> `advice_config`), an obvious concern with this patch series is: How can we
> guarantee that we're not introducing a similar problem when removing
> `advice_config`? A future branch could easily add entries to that array,
> and a merge of this here topic could potentially forget to add those
> entries to `advice_settings`.
>
> However, such a future merge would always cause merge (add/remove)
> conflicts in the `advice_config` array, i.e. it will be much easier to
> notice such a divergence, and hence it will be much more likely that the
> `advice_setting` array will be adjusted accordingly in such a hypothetical
Yes, Git should be able to notice a conflict of this nature.
Thanks,
--Ben
next prev parent reply other threads:[~2021-08-03 0:45 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-31 2:25 [PATCH v1 0/4] advice: remove usage of `advice_*` global variables Ben Boeckel
2021-07-31 2:25 ` [PATCH v1 1/4] advice: add a function to set the value of an advice type Ben Boeckel
2021-08-02 21:56 ` Johannes Schindelin
2021-07-31 2:25 ` [PATCH v1 2/4] advice: add enum variants for missing advice variables Ben Boeckel
2021-08-02 21:52 ` Johannes Schindelin
2021-08-03 0:36 ` Ben Boeckel
2021-07-31 2:25 ` [PATCH v1 3/4] advice: remove uses of global `advice_` variables Ben Boeckel
2021-08-02 22:06 ` Johannes Schindelin
2021-08-03 0:42 ` Ben Boeckel
2021-07-31 2:25 ` [PATCH v1 4/4] advice: remove static global variables for advice tracking Ben Boeckel
2021-08-02 22:09 ` Johannes Schindelin
2021-08-03 0:44 ` Ben Boeckel
2021-08-02 22:15 ` [PATCH v1 0/4] advice: remove usage of `advice_*` global variables Johannes Schindelin
2021-08-03 0:45 ` Ben Boeckel [this message]
2021-08-05 23:03 ` [PATCH v2 " Ben Boeckel
2021-08-05 23:03 ` [PATCH v2 1/4] advice: add enum variants for missing advice variables Ben Boeckel
2021-08-05 23:03 ` [PATCH v2 2/4] advice: remove read uses of global `advice_` variables Ben Boeckel
2021-08-05 23:03 ` [PATCH v2 3/4] advice: add `advice_set` to update advice settings at runtime Ben Boeckel
2021-08-05 23:03 ` [PATCH v2 4/4] advice: remove static global variables for advice tracking Ben Boeckel
2021-08-06 19:13 ` [RFC PATCH v3 0/4] advice: remove usage of `advice_*` global variables Ævar Arnfjörð Bjarmason
2021-08-06 19:13 ` [RFC PATCH v3 1/4] advice: add enum variants for missing advice variables Ævar Arnfjörð Bjarmason
2021-08-06 19:13 ` [RFC PATCH v3 2/4] advice: remove read uses of most global `advice_` variables Ævar Arnfjörð Bjarmason
2021-08-06 19:30 ` Eric Sunshine
2021-08-06 19:13 ` [RFC PATCH v3 3/4] advice: remove use of global advice_add_embedded_repo Ævar Arnfjörð Bjarmason
2021-08-06 20:01 ` Eric Sunshine
2021-08-06 19:13 ` [RFC PATCH v3 4/4] advice: move advice.graftFileDeprecated squashing to commit.[ch] Ævar Arnfjörð Bjarmason
2021-08-23 10:43 ` [PATCH v4 0/4] advice: remove usage of `advice_*` global variables Ævar Arnfjörð Bjarmason
2021-08-23 10:43 ` [PATCH v4 1/4] advice: add enum variants for missing advice variables Ævar Arnfjörð Bjarmason
2021-08-23 10:44 ` [PATCH v4 2/4] advice: remove read uses of most global `advice_` variables Ævar Arnfjörð Bjarmason
2021-08-23 10:44 ` [PATCH v4 3/4] advice: remove use of global advice_add_embedded_repo Ævar Arnfjörð Bjarmason
2021-08-23 10:44 ` [PATCH v4 4/4] advice: move advice.graftFileDeprecated squashing to commit.[ch] Ævar Arnfjörð Bjarmason
2021-08-25 19:07 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YQiRsEzF8psNTqRR@erythro.dev.benboeckel.internal \
--to=mathstuf@gmail$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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