diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-05 12:00:04 -0700 |
| commit | d9c82fa7a75ae617718f195bb5f5ff5c904f2687 (patch) | |
| tree | 202fad68c8cd4f1dc82f7e51bbd3b53eb391c077 /builtin/config.c | |
| parent | 9eabf5b536662000f79978c4d1b6e4eff5c8d785 (diff) | |
| parent | 846e5dfbab5d5a0a85252c1400dc0371e02e75a8 (diff) | |
| download | git-d9c82fa7a75ae617718f195bb5f5ff5c904f2687.tar.gz | |
Merge branch 'pt/xdg-config-path' into maint
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()
t0302: "unreadable" test needs POSIXPERM
t0302: test credential-store support for XDG_CONFIG_HOME
git-credential-store: support XDG_CONFIG_HOME
git-credential-store: support multiple credential files
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 bfd3016e83..a58f99c2d7 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) /* |