From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 28 Dec 2025 09:15:27 +0000 (+0900)
Subject: Merge branch 'rs/macos-iconv-workaround' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94ed7767197a50da99a07e049605101eb4f64475;p=thirdparty%2Fgit.git

Merge branch 'rs/macos-iconv-workaround' into next

Workaround the "iconv" shipped as part of macOS, which is broken
handling stateful ISO/IEC 2022 encoded strings.

* rs/macos-iconv-workaround:
  macOS: use iconv from Homebrew if needed and present
  macOS: make Homebrew use configurable
---

94ed7767197a50da99a07e049605101eb4f64475