git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Greg Hurrell" <greg@hurrell.net>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org
Subject: Re: git-checkout doesn't seem to respect config from include.path
Date: Thu, 03 Feb 2022 08:48:42 +0100	[thread overview]
Message-ID: <6a898459-ee74-49b1-96cb-98fd766d082d@beta.fastmail.com> (raw)
In-Reply-To: <YfsMYTo1tND5JKNx@camp.crustytoothpaste.net>

On Wed, Feb 2, 2022, at 11:57 PM, brian m. carlson wrote:
> This definitely doesn't sound like the expected behavior here.  It's not
> clear to me why this is happening, but it probably shouldn't be.  It
> doesn't appear that we fail to call the config callback, since we've
> been doing that since 2010.
> 
> What version of Git are you using that's not working?

Initially noticed on v2.30.2, but you can reproduce it to similar
effect on v2.35.0 (ie. add an invalid "merge.conflictStyle" value
like "fizzbuzz" to ~/.gitconfig, and a valid one like "diff3" to
a file pulled in via "include.path", and you'll see the same
behavior).

Cheers,
Greg

  reply	other threads:[~2022-02-03  7:49 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 [this message]
2022-02-03 15:54 ` Phillip Wood
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=6a898459-ee74-49b1-96cb-98fd766d082d@beta.fastmail.com \
    --to=greg@hurrell.net \
    --cc=git@vger.kernel.org \
    --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).