From: Junio C Hamano Date: Wed, 21 Jan 2026 16:28:57 +0000 (-0800) Subject: Merge branch 'tb/macos-iconv-workarounds' X-Git-Tag: v2.53.0-rc1~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a5dcc1259fa0c8f5c21352c90b3cd3d43273345;p=thirdparty%2Fgit.git Merge branch 'tb/macos-iconv-workarounds' 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 --- 0a5dcc1259fa0c8f5c21352c90b3cd3d43273345