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

diff --cc builtin/show-ref.c
Simple merge

diff --cc upload-pack.c
index d2ea5eb20d90557de4dc979d98a9479e0c2e7d9b,c9b91763018eaee16aa85aec21c5f4204c815517..24298913c0d7932e20f4677d3b8a4ea62ed69f8d
--- 1/upload-pack.c
--- 2/upload-pack.c
+++ b/upload-pack.c
@@@ -1067,8 -1041,8 +1067,10 @@@ static int upload_pack_config(const cha
                allow_filter = git_config_bool(var, value);
        } else if (!strcmp("uploadpack.allowrefinwant", var)) {
                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) {