From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Dec 2025 02:33:34 +0000 (+0900)
Subject: Merge branch 'rs/macos-iconv-workaround' into jch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ba3a90b2ea9ceb44361bd54cdcc316ef63a927b;p=thirdparty%2Fgit.git

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

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

Comments?

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

1ba3a90b2ea9ceb44361bd54cdcc316ef63a927b