From 2527bbce25dcfd952064cf02057ad8729134ed44 Mon Sep 17 00:00:00 2001 From: Paul Tan Date: Wed, 6 May 2015 16:00:59 +0800 Subject: [PATCH] attr.c: replace home_config_paths() with xdg_config_home() Since only the xdg attributes file path is required, simplify the code by using xdg_config_home() instead of home_config_paths(). Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano --- attr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/attr.c b/attr.c index cd5469770a..c82904b6f2 100644 --- a/attr.c +++ b/attr.c @@ -478,7 +478,6 @@ static int git_attr_system(void) static void bootstrap_attr_stack(void) { struct attr_stack *elem; - char *xdg_attributes_file; if (attr_stack) return; @@ -497,10 +496,8 @@ static void bootstrap_attr_stack(void) } } - if (!git_attributes_file) { - home_config_paths(NULL, &xdg_attributes_file, "attributes"); - git_attributes_file = xdg_attributes_file; - } + if (!git_attributes_file) + git_attributes_file = xdg_config_home("attributes"); if (git_attributes_file) { elem = read_attr_from_file(git_attributes_file, 1); if (elem) { -- 2.11.4.GIT