undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attr.c: replace home_config_paths() with xdg_config_home()

Browse Source 
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 <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Paul Tan 2015-05-06 16:00:59 +08:00 committed by Junio C Hamano
parent ea19289bc8
commit 2527bbce25
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
attr.c
View File

@ -478,7 +478,6 @@ static int git_attr_system(void)
static void bootstrap_attr_stack(void) static void bootstrap_attr_stack(void)
{ {
struct attr_stack *elem; struct attr_stack *elem;
char *xdg_attributes_file;
if (attr_stack) if (attr_stack)
return; return;
@ -497,10 +496,8 @@ static void bootstrap_attr_stack(void)
} }
} }
if (!git_attributes_file) { if (!git_attributes_file)
home_config_paths(NULL, &xdg_attributes_file, "attributes"); git_attributes_file = xdg_config_home("attributes");
git_attributes_file = xdg_attributes_file;
}
if (git_attributes_file) { if (git_attributes_file) {
elem = read_attr_from_file(git_attributes_file, 1); elem = read_attr_from_file(git_attributes_file, 1);
if (elem) { if (elem) {