From: Phillip Wood <phillip.wood123@gmail.com>
To: Greg Hurrell <greg@hurrell.net>, git@vger.kernel.org
Cc: "Brian M. Carlson" <sandals@crustytoothpaste.net>
Subject: Re: git-checkout doesn't seem to respect config from include.path
Date: Thu, 3 Feb 2022 15:54:23 +0000 [thread overview]
Message-ID: <0b8222c2-7337-7e8f-33d1-7926462daac1@gmail.com> (raw)
In-Reply-To: <ee1dd453-e698-440a-911b-d14389e33715@beta.fastmail.com>
Hi Greg
On 02/02/2022 16:04, Greg Hurrell wrote:
> Hi,
>
> Not sure if this is confined specifically to `git-checkout`, but that's
> the command I noticed the issue with:
>
> With the release of the v2.35.0 and the "zdiff3" setting for
> "merge.conflictStyle", I find myself wanting to use "zdiff3" on machines
> running the new version, and falling back to "diff3" on machines with an
> older version.
>
> To this end, I have a ~/.gitconfig that contains:
>
> [merge]
> conflictStyle = zdiff3
> [include]
> path = ~/.gitconfig.local
>
> The idea is that I can use the same `~/.gitconfig` on every machine I
> use, but on machines that only have an older Git version, I drop in a
> ~/.gitconfig.local with overrides like this:
>
> [merge]
> conflictStyle = diff3
>
> `git config --get merge.conflictStyle` correctly reports that my setting is
> "diff3" on such machines, and `git config --get-all merge.conflictStyle`
> shows:
>
> diff3
> zdiff3
>
> In other words, it knows that I have multiple values set, but it uses
> a last-one-wins policy.
>
> However, when I try to run a command like `git checkout -b something`,
> Git dies with:
>
> fatal: unknown style 'zdiff3' given for 'merge.conflictstyle'
I think what is happening is that git parses each line of the config
file as it reads it so the old version of git sees "zdiff3" and errors
out before it reads the include line. I'm afraid I don't have any useful
suggestions for avoiding this other than switching the include around so
that it contains zdiff3 and is only included by newer versions of git.
> So, it looks like something in `git-checkout`'s option processing is
> causing it to disregard the override set via "include.path". In fact, it
> even disregards a value passed in with `-c` like this:
>
> git -c merge.conflictStyle=diff3 checkout -b something
I think the values passed with -c are parsed after all the config files
so the override works. What we really want in this case is to store the
string value for each config option as we read each config source and
then parse those values at the end, unfortunately I think that would
break multi-valued config keys.
Best Wishes
Phillip
> Does this sound like a bug, or are my expectations off? I'd be happy to
> look into fixing this, but first would like to know whether it is
> expected behavior.
>
> Cheers,
> Greg
next prev parent reply other threads:[~2022-02-03 15:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-02 16:04 git-checkout doesn't seem to respect config from include.path Greg Hurrell
2022-02-02 22:57 ` brian m. carlson
2022-02-03 7:48 ` Greg Hurrell
2022-02-03 15:54 ` Phillip Wood [this message]
2022-02-03 17:39 ` Greg Hurrell
2022-02-03 17:42 ` Greg Hurrell
2022-02-07 14:05 ` Phillip Wood
2022-02-03 18:07 ` Junio C Hamano
2022-02-07 14:01 ` Phillip Wood
2022-02-07 23:50 ` 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
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=0b8222c2-7337-7e8f-33d1-7926462daac1@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=greg@hurrell.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=sandals@crustytoothpaste.net \
/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).