]> granicus.if.org Git - git/commitdiff
dir.c: replace home_config_paths() with xdg_config_home()
authorPaul Tan <pyokagan@gmail.com>
Wed, 6 May 2015 08:01:00 +0000 (16:01 +0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 18:33:17 +0000 (11:33 -0700)
Since only the xdg excludes file path is required, simplify the code by
replacing use of home_config_paths() with xdg_config_home().

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
dir.c

diff --git a/dir.c b/dir.c
index 3f7a0256b61552c6c3f80f710bd042b697d79da9..cb8f5496ca38f20f430ce852fb9c747c7355e12b 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -1622,14 +1622,11 @@ int remove_dir_recursively(struct strbuf *path, int flag)
 void setup_standard_excludes(struct dir_struct *dir)
 {
        const char *path;
-       char *xdg_path;
 
        dir->exclude_per_dir = ".gitignore";
        path = git_path("info/exclude");
-       if (!excludes_file) {
-               home_config_paths(NULL, &xdg_path, "ignore");
-               excludes_file = xdg_path;
-       }
+       if (!excludes_file)
+               excludes_file = xdg_config_home("ignore");
        if (!access_or_warn(path, R_OK, 0))
                add_excludes_from_file(dir, path);
        if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))