]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d807c22 cee341e)
Merge branch 'rs/macos-iconv-workaround' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 28 Dec 2025 09:15:27 +0000 (18:15 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 28 Dec 2025 09:15:27 +0000 (18:15 +0900)
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

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

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