From e682c9db1a7c6a81bb4c2e8e8c1d5191dae3bd9f Mon Sep 17 00:00:00 2001 From: Paul Tan Date: Wed, 6 May 2015 16:01:02 +0800 Subject: [PATCH] git-commit: replace use of home_config_paths() Since home_config_paths() combines two distinct functionality already implemented by expand_user_path() and xdg_config_home(), and hides the home config file path ~/.gitconfig. Make the code more explicit by replacing the use of home_config_paths() with expand_user_path() and xdg_config_home(). Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano --- builtin/commit.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 7d90c35915..b4aaaab5bc 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1402,12 +1402,10 @@ int cmd_status(int argc, const char **argv, const char *prefix) static const char *implicit_ident_advice(void) { - char *user_config = NULL; - char *xdg_config = NULL; - int config_exists; + char *user_config = expand_user_path("~/.gitconfig"); + char *xdg_config = xdg_config_home("config"); + int config_exists = file_exists(user_config) || file_exists(xdg_config); - home_config_paths(&user_config, &xdg_config, "config"); - config_exists = file_exists(user_config) || file_exists(xdg_config); free(user_config); free(xdg_config); -- 2.11.4.GIT