diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:30 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:30 +0900 |
| commit | 97616ca488ba460e20cbbb3374aabc97919b44ca (patch) | |
| tree | 89f11f354d9f9c3e27d02fe2aa01c672655b26ec /upload-pack.c | |
| parent | Merge branch 'dl/difftool-mergetool' (diff) | |
| parent | Honor core.precomposeUnicode in more places (diff) | |
| download | git-97616ca488ba460e20cbbb3374aabc97919b44ca.tar.xz git-97616ca488ba460e20cbbb3374aabc97919b44ca.zip | |
Merge branch 'en/unicode-in-refnames'
On a filesystem like HFS+, the names of the refs stored as filesystem
entities may become different from what the end-user expects, just
like files in the working tree get "renamed". Work around the
mismatch by paying attention to the core.precomposeUnicode
configuration.
* en/unicode-in-refnames:
Honor core.precomposeUnicode in more places
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/upload-pack.c b/upload-pack.c index d2ea5eb20d9..24298913c0d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1069,6 +1069,8 @@ static int upload_pack_config(const char *var, const char *value, void *unused) allow_ref_in_want = git_config_bool(var, value); } else if (!strcmp("uploadpack.allowsidebandall", var)) { allow_sideband_all = git_config_bool(var, value); + } else if (!strcmp("core.precomposeunicode", var)) { + precomposed_unicode = git_config_bool(var, value); } if (current_config_scope() != CONFIG_SCOPE_REPO) { |