diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-29 21:30:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 21:30:10 (GMT) |
| commit | 7ebb906ddd69628fc9874b1266257ae2256b8f14 (patch) | |
| tree | ad17ef0ca7462e48e0279f709c7aa21c23c3cf67 /builtin | |
| parent | 4818cfcdcc8011e5eef353d0f64cd9d2374ea381 (diff) | |
| parent | 4698c8feb1bb56497215e0c10003dd046df352fa (diff) | |
| download | git-7ebb906ddd69628fc9874b1266257ae2256b8f14.zip git-7ebb906ddd69628fc9874b1266257ae2256b8f14.tar.gz git-7ebb906ddd69628fc9874b1266257ae2256b8f14.tar.bz2 | |
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 'builtin')
| -rw-r--r-- | builtin/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c index 33c9bf9..19ffcaf 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -379,8 +379,8 @@ int cmd_config(int argc, const char **argv, const char *prefix) */ die("$HOME not set"); - if (access_or_warn(user_config, R_OK) && - xdg_config && !access_or_warn(xdg_config, R_OK)) + if (access_or_warn(user_config, R_OK, 0) && + xdg_config && !access_or_warn(xdg_config, R_OK, 0)) given_config_file = xdg_config; else given_config_file = user_config; |