diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:24:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:24:01 -0700 |
| commit | 558e5a8c40944a6a952c7e15dab648b922e0bd02 (patch) | |
| tree | 0416da7b9ef7b43c3d5e5bf766507b43735db5d3 /builtin/config.c | |
| parent | 7cb5073fcaffe8a8c0572fdffb332110b0eaae69 (diff) | |
| parent | 846e5dfbab5d5a0a85252c1400dc0371e02e75a8 (diff) | |
| download | git-558e5a8c40944a6a952c7e15dab648b922e0bd02.tar.gz | |
Merge branch 'pt/xdg-config-path'
Code clean-up for xdg configuration path support.
* pt/xdg-config-path:
path.c: remove home_config_paths()
git-config: replace use of home_config_paths()
git-commit: replace use of home_config_paths()
credential-store.c: replace home_config_paths() with xdg_config_home()
dir.c: replace home_config_paths() with xdg_config_home()
attr.c: replace home_config_paths() with xdg_config_home()
path.c: implement xdg_config_home()
Diffstat (limited to 'builtin/config.c')
| -rw-r--r-- | builtin/config.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin/config.c b/builtin/config.c index 28f57c8fb9..7188405f7e 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -488,10 +488,8 @@ int cmd_config(int argc, const char **argv, const char *prefix) } if (use_global_config) { - char *user_config = NULL; - char *xdg_config = NULL; - - home_config_paths(&user_config, &xdg_config, "config"); + char *user_config = expand_user_path("~/.gitconfig"); + char *xdg_config = xdg_config_home("config"); if (!user_config) /* |