From: Junio C Hamano Date: Fri, 16 Jan 2026 20:40:37 +0000 (-0800) Subject: Merge branch 'tb/macos-iconv-workarounds' into jch X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3db75c22d3bc8bc55d125f2ea8fb9d7201a8c3ee;p=thirdparty%2Fgit.git 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 --- 3db75c22d3bc8bc55d125f2ea8fb9d7201a8c3ee