mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tb/precompose-prefix-simplify'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2021-04-13 15:28:51 -07:00
parent 1d5fbd45c4 c7d0e61016
commit 4c6ac2da2c
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git.c
View File

@ -423,7 +423,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
int nongit_ok;
prefix = setup_git_directory_gently(&nongit_ok);
}
prefix = precompose_argv_prefix(argc, argv, prefix);
precompose_argv_prefix(argc, argv, NULL);
if (use_pager == -1 && p->option & (RUN_SETUP | RUN_SETUP_GENTLY) &&
!(p->option & DELAY_PAGER_CONFIG))
use_pager = check_pager_config(p->cmd);