]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2dba4f 6937a25)
Merge branch 'rs/macos-iconv-workaround' into jch
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Dec 2025 02:33:34 +0000 (11:33 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Dec 2025 02:33:34 +0000 (11:33 +0900)
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

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.