diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:30:10 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:30:10 -0700 |
commit | 7ebb906ddd69628fc9874b1266257ae2256b8f14 (patch) | |
tree | ad17ef0ca7462e48e0279f709c7aa21c23c3cf67 /dir.c | |
parent | 4818cfcdcc8011e5eef353d0f64cd9d2374ea381 (diff) | |
parent | 4698c8feb1bb56497215e0c10003dd046df352fa (diff) | |
download | git-7ebb906ddd69628fc9874b1266257ae2256b8f14.tar.gz |
Merge branch 'jn/config-ignore-inaccessible'
When $HOME is misconfigured to point at an unreadable directory, we
used to complain and die. This loosens the check.
* jn/config-ignore-inaccessible:
config: allow inaccessible configuration under $HOME
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1542,9 +1542,9 @@ void setup_standard_excludes(struct dir_struct *dir) home_config_paths(NULL, &xdg_path, "ignore"); excludes_file = xdg_path; } - if (!access_or_warn(path, R_OK)) + if (!access_or_warn(path, R_OK, 0)) add_excludes_from_file(dir, path); - if (excludes_file && !access_or_warn(excludes_file, R_OK)) + if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) add_excludes_from_file(dir, excludes_file); } |