From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Apr 2021 22:28:51 +0000 (-0700)
Subject: Merge branch 'tb/precompose-prefix-simplify'
X-Git-Tag: v2.32.0-rc0~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c6ac2da2c1da66a3fba429aa983e481c41fa1d0;p=thirdparty%2Fgit.git

Merge branch 'tb/precompose-prefix-simplify'

Streamline the codepath to fix the UTF-8 encoding issues in the
argv[] and the prefix on macOS.

* tb/precompose-prefix-simplify:
  macOS: precompose startup_info->prefix
  precompose_utf8: make precompose_string_if_needed() public
---

4c6ac2da2c1da66a3fba429aa983e481c41fa1d0