From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 May 2019 07:45:30 +0000 (+0900)
Subject: Merge branch 'en/unicode-in-refnames'
X-Git-Tag: v2.22.0-rc1~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/97616ca488ba460e20cbbb3374aabc97919b44ca

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
---

97616ca488ba460e20cbbb3374aabc97919b44ca
diff --cc upload-pack.c
index d2ea5eb20d,c9b9176301..24298913c0
--- a/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) {