diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-14 00:28:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-14 00:28:51 +0200 |
| commit | 4c6ac2da2c1da66a3fba429aa983e481c41fa1d0 (patch) | |
| tree | 2287064be5533324cc3d90ae5ceadee1cfe97412 /git.c | |
| parent | Merge branch 'fm/user-manual-use-preface' (diff) | |
| parent | macOS: precompose startup_info->prefix (diff) | |
| download | git-4c6ac2da2c1da66a3fba429aa983e481c41fa1d0.tar.xz git-4c6ac2da2c1da66a3fba429aa983e481c41fa1d0.zip | |
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
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |