From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Derrick Stolee <derrickstolee@github.com>
Subject: Re: What's cooking in git.git (May 2023, #04; Thu, 11)
Date: Thu, 11 May 2023 20:36:36 -0500 [thread overview]
Message-ID: <CAMP44s0GAiFhoHFo4Ex464utf2Jm1F-LEdX2PZdUGEdp5x6Liw@mail.gmail.com> (raw)
In-Reply-To: <xmqqo7mqs7rp.fsf@gitster.g>
Junio C Hamano wrote:
> * ds/merge-tree-use-config (2023-05-10) 1 commit
> (merged to 'next' on 2023-05-11 at e0dab53028)
> + merge-tree: load default git config
>
> Allow git forges to disable replace-refs feature while running "git
> merge-tree".
>
> Will merge to 'master'.
> source: <pull.1530.git.1683745654800.gitgitgadget@gmail.com>
Why was this series merged after only 11 minutes of review window? Are patches
from GitHub favored over all others?
As I explained here [1], this is clearly the wrong approach because it ends up
calling git_default_config *twice*.
The simplest fix is [2], which simply shuffles one line of code.
The proper fix is to reorganize the way merge_recursive_config() works, so
git_xmerge_config is called only once at the right time (before any
option parsing). That not only fixes the reported bug, but also makes
merge.conflictStyle work for both real merges and trivial merges, along with
fixing other issues.
[1] https://lore.kernel.org/git/645d672447ebb_13d3fe294f@chronos.notmuch/
[2] https://lore.kernel.org/git/20230511215608.1297686-1-felipe.contreras@gmail.com/
[3] https://lore.kernel.org/git/20230511235951.2309462-1-felipe.contreras@gmail.com/
--
Felipe Contreras
next prev parent reply other threads:[~2023-05-12 1:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-12 0:39 What's cooking in git.git (May 2023, #04; Thu, 11) Junio C Hamano
2023-05-12 1:36 ` Felipe Contreras [this message]
2023-05-12 3:05 ` Taylor Blau
2023-05-12 3:46 ` Felipe Contreras
2023-05-12 7:13 ` ps/fetch-output-format (was: What's cooking in git.git (May 2023, #04; Thu, 11)) Patrick Steinhardt
2023-05-12 19:33 ` ps/fetch-output-format Junio C Hamano
2023-05-12 15:26 ` tl/push-branches-is-an-alias-for-all (Was: Re: What's cooking in git.git (May 2023, #04; Thu, 11)) Elijah Newren
2023-05-12 17:23 ` tl/push-branches-is-an-alias-for-all Junio C Hamano
2023-05-12 20:52 ` What's cooking in git.git (May 2023, #04; Thu, 11) brian m. carlson
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=CAMP44s0GAiFhoHFo4Ex464utf2Jm1F-LEdX2PZdUGEdp5x6Liw@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 read-only IMAP folder(s) and NNTP newsgroup(s).