On 2022-02-02 at 16:04:26, Greg Hurrell wrote: > However, when I try to run a command like `git checkout -b something`, > Git dies with: > > fatal: unknown style 'zdiff3' given for 'merge.conflictstyle' > > 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 > > 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. 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? -- brian m. carlson (he/him or they/them) Toronto, Ontario, CA
Attachment:
signature.asc
Description: PGP signature
