kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2019-05-19 16:45:30 +09:00
parent 85ac27e04f 8e712ef6fc
commit 97616ca488
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/pack-refs.c
View File

@ -1,4 +1,5 @@
#include "builtin.h" #include "builtin.h"
#include "config.h"
#include "parse-options.h" #include "parse-options.h"
#include "refs.h" #include "refs.h"
#include "repository.h" #include "repository.h"
@ -16,6 +17,7 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix)
OPT_BIT(0, "prune", &flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE), OPT_BIT(0, "prune", &flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE),
OPT_END(), OPT_END(),
}; };
git_config(git_default_config, NULL);
if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0)) if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
usage_with_options(pack_refs_usage, opts); usage_with_options(pack_refs_usage, opts);
return refs_pack_refs(get_main_ref_store(the_repository), flags); return refs_pack_refs(get_main_ref_store(the_repository), flags);

3
builtin/show-ref.c
View File

@ -1,5 +1,6 @@
#include "builtin.h" #include "builtin.h"
#include "cache.h" #include "cache.h"
#include "config.h"
#include "refs.h" #include "refs.h"
#include "object-store.h" #include "object-store.h"
#include "object.h" #include "object.h"
@ -182,6 +183,8 @@ static const struct option show_ref_options[] = {


int cmd_show_ref(int argc, const char **argv, const char *prefix) int cmd_show_ref(int argc, const char **argv, const char *prefix)
{ {
git_config(git_default_config, NULL);

argc = parse_options(argc, argv, prefix, show_ref_options, argc = parse_options(argc, argv, prefix, show_ref_options,
show_ref_usage, 0); show_ref_usage, 0);



2
upload-pack.c
View File

@ -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); allow_ref_in_want = git_config_bool(var, value);
} else if (!strcmp("uploadpack.allowsidebandall", var)) { } else if (!strcmp("uploadpack.allowsidebandall", var)) {
allow_sideband_all = git_config_bool(var, value); 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) { if (current_config_scope() != CONFIG_SCOPE_REPO) {