]> git.ipfire.org Git - thirdparty/git.git/commit - setup.c
macOS: precompose startup_info->prefix
authorTorsten Bögershausen <tboegi@web.de>
Sun, 4 Apr 2021 17:14:14 +0000 (19:14 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2021 00:30:36 +0000 (17:30 -0700)
commitc7d0e61016bfa1c6aec04b0d7daec2e64cfccf3e
tree8238d28125db8ed1393bf3b7e4f9df85c25750be
parent5020774aef3fc80c89fac2e04d4ed0aeac66cdf0
macOS: precompose startup_info->prefix

The "prefix" was precomposed for macOS in commit 5c327502 (MacOS:
precompose_argv_prefix(), 2021-02-03).

However, this commit forgot to update "startup_info->prefix" after
precomposing.

Move the (possible) precomposition towards the end of
setup_git_directory_gently(), so that precompose_string_if_needed()
can use git_config_get_bool("core.precomposeunicode") correctly.

Keep prefix, startup_info->prefix and GIT_PREFIX_ENVIRONMENT all in sync.

And as a result, the prefix no longer needs to be precomposed in git.c

Reported-by: Dmitry Torilov <d.torilov@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git.c
setup.c