@matheusbsbs / matheus-bagliano / commits / 1e06eb9b5d

config: unify code paths to get global config paths

There's two callsites which assemble global config paths, once in the config loading code and once in the git-config(1) builtin. We're about to implement a way to override global config paths via an environment variable which would require us to adjust both sites. Unify both code paths into a single `git_global_config()` function which returns both paths for `~/.gitconfig` and the XDG config file. This will make the subsequent patch which introduces the new envvar easier to implement. No functional changes are expected from this patch. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Apr 19, 2021 at 14:31 UTC 1e06eb9b5dc9c663c2a60a2ca63e218b41a765e8

3 files changed +13 -4

builtin/config.c

+2 -2

@@ -671,9 +671,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)

671 }

672

673 if (use_global_config) {

674 - char *user_config = expand_user_path("~/.gitconfig", 0);

675 - char *xdg_config = xdg_config_home("config");

674 + char *user_config, *xdg_config;

675

676 + git_global_config(&user_config, &xdg_config);

677 if (!user_config)

678 /*

679 * It is unknown if HOME/.gitconfig exists, so

config.c

+10 -2

@@ -1849,6 +1849,12 @@ char *git_system_config(void)

1849 return system_path(ETC_GITCONFIG);

1850 }

1851

1852 +void git_global_config(char **user_config, char **xdg_config)

1853 +{

1854 + *user_config = expand_user_path("~/.gitconfig", 0);

1855 + *xdg_config = xdg_config_home("config");

1856 +}

1857 +

1858 /*

1859 * Parse environment variable 'k' as a boolean (in various

1860 * possible spellings); if missing, use the default value 'def'.

@@ -1881,8 +1887,8 @@ static int do_git_config_sequence(const struct config_options *opts,

1887 {

1888 int ret = 0;

1889 char *system_config = git_system_config();

1884 - char *xdg_config = xdg_config_home("config");

1885 - char *user_config = expand_user_path("~/.gitconfig", 0);

1890 + char *xdg_config = NULL;

1891 + char *user_config = NULL;

1892 char *repo_config;

1893 enum config_scope prev_parsing_scope = current_parsing_scope;

1894

@@ -1900,6 +1906,8 @@ static int do_git_config_sequence(const struct config_options *opts,

1906 ret += git_config_from_file(fn, system_config, data);

1907

1908 current_parsing_scope = CONFIG_SCOPE_GLOBAL;

1909 + git_global_config(&user_config, &xdg_config);

1910 +

1911 if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK))

1912 ret += git_config_from_file(fn, xdg_config, data);

1913

config.h

@@ -327,6 +327,7 @@ int config_error_nonbool(const char *);

327 #endif

328

329 char *git_system_config(void);

330 +void git_global_config(char **user, char **xdg);

331

332 int git_config_parse_parameter(const char *, config_fn_t fn, void *data);

333