summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-05 19:00:04 (GMT)
commitd9c82fa7a75ae617718f195bb5f5ff5c904f2687 (patch)
tree202fad68c8cd4f1dc82f7e51bbd3b53eb391c077 /attr.c
parent9eabf5b536662000f79978c4d1b6e4eff5c8d785 (diff)
parent846e5dfbab5d5a0a85252c1400dc0371e02e75a8 (diff)
downloadgit-d9c82fa7a75ae617718f195bb5f5ff5c904f2687.zip
git-d9c82fa7a75ae617718f195bb5f5ff5c904f2687.tar.gz
git-d9c82fa7a75ae617718f195bb5f5ff5c904f2687.tar.bz2
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 'attr.c')
-rw-r--r--attr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/attr.c b/attr.c
index 7f44596..8f2ac6c 100644
--- a/attr.c
+++ b/attr.c
@@ -493,7 +493,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;
@@ -512,10 +511,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) {