]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'tb/macos-iconv-workarounds' into jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Jan 2026 20:40:37 +0000 (12:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Jan 2026 20:40:38 +0000 (12:40 -0800)
commit3db75c22d3bc8bc55d125f2ea8fb9d7201a8c3ee
tree0b6e2f763b3f33d25f9ce51aa7b95d0d28c3d081
parenta2e5caf15cbdc54f3aaa02cf770b80a3dfdf8945
parentd28124151851e42a3bb92963f5b747ad843f33e0
Merge branch 'tb/macos-iconv-workarounds' into jch

The iconv library on macOS fails to correctly handle stateful
ISO/IEC 2022 encoded strings.  Work it around instead of replacing
it wholesale from homebrew.

* tb/macos-iconv-workarounds:
  utf8.c: enable workaround for iconv under macOS 14/15
  utf8.c: prepare workaround for iconv under macOS 14/15