git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-checkout doesn't seem to respect config from include.path

From
Greg Hurrell <greg@hurrell.net>
Date
Feb 3, 2022, 07:48 UTC
Message-ID
<6a898459-ee74-49b1-96cb-98fd766d082d@beta.fastmail.com>
In-Reply-To
<YfsMYTo1tND5JKNx@camp.crustytoothpaste.net>
On Wed, Feb 2, 2022, at 11:57 PM, brian m. carlson wrote:
Show 6 quoted lines
> 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

Previous: brian m. carlsonNext: Phillip Wood
Message 3 of 10 in “git-checkout doesn't seem to respect config from include.path”
  1. Greg HurrellFeb 2, 2022
  2. brian m. carlsonFeb 2, 2022
  3. Greg HurrellFeb 3, 2022
  4. Phillip WoodFeb 3, 2022
  5. Greg HurrellFeb 3, 2022
  6. Greg HurrellFeb 3, 2022
  7. Phillip WoodFeb 7, 2022
  8. Junio C HamanoFeb 3, 2022
  9. Phillip WoodFeb 7, 2022
  10. Junio C HamanoFeb 7, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.