diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-05-06 16:00:59 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-06 11:32:46 -0700 |
| commit | 2527bbce25dcfd952064cf02057ad8729134ed44 (patch) | |
| tree | eca16d8301b4a4e400627ff6f374d820144583e9 | |
| parent | ea19289bc82351b7ac20ea2fd877e2bdde97ae34 (diff) | |
| download | git-2527bbce25dcfd952064cf02057ad8729134ed44.tar.gz | |
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 <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | attr.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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) { |