diff options
| author | Patrick Steinhardt <ps@pks.im> | 2021-04-19 14:31:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-19 23:16:59 +0200 |
| commit | 1e06eb9b5dc9c663c2a60a2ca63e218b41a765e8 (patch) | |
| tree | d89055322ac685bdec26afbae8b5d189b5fde15d /builtin/config.c | |
| parent | config: rename `git_etc_config()` (diff) | |
| download | git-1e06eb9b5dc9c663c2a60a2ca63e218b41a765e8.tar.xz git-1e06eb9b5dc9c663c2a60a2ca63e218b41a765e8.zip | |
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>
Diffstat (limited to 'builtin/config.c')
| -rw-r--r-- | builtin/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c index 02ed0b3fe7..865fddd6ce 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -671,9 +671,9 @@ int cmd_config(int argc, const char **argv, const char *prefix) } if (use_global_config) { - char *user_config = expand_user_path("~/.gitconfig", 0); - char *xdg_config = xdg_config_home("config"); + char *user_config, *xdg_config; + git_global_config(&user_config, &xdg_config); if (!user_config) /* * It is unknown if HOME/.gitconfig exists, so |