Skip to content

Commit

Permalink
dir.c: replace home_config_paths() with xdg_config_home()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Tan authored and Junio C Hamano committed May 6, 2015
1 parent 2527bbc commit 2845ce7
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 2845ce7

Please sign in to comment.