mirror of
https://github.com/git/git.git
synced 2026-01-09 01:34:00 +00:00
Merge branch 'ps/config-wo-the-repository'
The config API had a set of convenience wrapper functions that implicitly use the_repository instance; they have been removed and inlined at the calling sites. * ps/config-wo-the-repository: (21 commits) config: fix sign comparison warnings config: move Git config parsing into "environment.c" config: remove unused `the_repository` wrappers config: drop `git_config_set_multivar()` wrapper config: drop `git_config_get_multivar_gently()` wrapper config: drop `git_config_set_multivar_in_file_gently()` wrapper config: drop `git_config_set_in_file_gently()` wrapper config: drop `git_config_set()` wrapper config: drop `git_config_set_gently()` wrapper config: drop `git_config_set_in_file()` wrapper config: drop `git_config_get_bool()` wrapper config: drop `git_config_get_ulong()` wrapper config: drop `git_config_get_int()` wrapper config: drop `git_config_get_string()` wrapper config: drop `git_config_get_string()` wrapper config: drop `git_config_get_string_multi()` wrapper config: drop `git_config_get_value()` wrapper config: drop `git_config_get_value()` wrapper config: drop `git_config_get()` wrapper config: drop `git_config_clear()` wrapper ...
This commit is contained in:
@@ -56,8 +56,8 @@ void probe_utf8_pathname_composition(void)
|
||||
close(output_fd);
|
||||
repo_git_path_replace(the_repository, &path, "%s", auml_nfd);
|
||||
precomposed_unicode = access(path.buf, R_OK) ? 0 : 1;
|
||||
git_config_set("core.precomposeunicode",
|
||||
precomposed_unicode ? "true" : "false");
|
||||
repo_config_set(the_repository, "core.precomposeunicode",
|
||||
precomposed_unicode ? "true" : "false");
|
||||
repo_git_path_replace(the_repository, &path, "%s", auml_nfc);
|
||||
if (unlink(path.buf))
|
||||
die_errno(_("failed to unlink '%s'"), path.buf);
|
||||
@@ -75,7 +75,7 @@ const char *precompose_string_if_needed(const char *in)
|
||||
iconv_t ic_prec;
|
||||
char *out;
|
||||
if (precomposed_unicode < 0)
|
||||
git_config_get_bool("core.precomposeunicode", &precomposed_unicode);
|
||||
repo_config_get_bool(the_repository, "core.precomposeunicode", &precomposed_unicode);
|
||||
if (precomposed_unicode != 1)
|
||||
return in;
|
||||
ic_prec = iconv_open(repo_encoding, path_encoding);
|
||||
|
||||
Reference in New Issue
Block a user