diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-04-13 15:28:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-13 15:28:51 -0700 |
| commit | 4c6ac2da2c1da66a3fba429aa983e481c41fa1d0 (patch) | |
| tree | 2287064be5533324cc3d90ae5ceadee1cfe97412 /git-compat-util.h | |
| parent | Merge branch 'fm/user-manual-use-preface' (diff) | |
| parent | macOS: precompose startup_info->prefix (diff) | |
| download | tgif-4c6ac2da2c1da66a3fba429aa983e481c41fa1d0.tar.xz | |
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-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 9ddf9d7044..a508dbe5a3 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -256,6 +256,11 @@ static inline const char *precompose_argv_prefix(int argc, const char **argv, co { return prefix; } +static inline const char *precompose_string_if_needed(const char *in) +{ + return in; +} + #define probe_utf8_pathname_composition() #endif |