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 /git-compat-util.h | |
| 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 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index e955bb5e8b..c1f8a477fb 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -692,8 +692,9 @@ int remove_or_warn(unsigned int mode, const char *path); * Call access(2), but warn for any error except "missing file" * (ENOENT or ENOTDIR). */ -int access_or_warn(const char *path, int mode); -int access_or_die(const char *path, int mode); +#define ACCESS_EACCES_OK (1U << 0) +int access_or_warn(const char *path, int mode, unsigned flag); +int access_or_die(const char *path, int mode, unsigned flag); /* Warn on an inaccessible file that ought to be accessible */ void warn_on_inaccessible(const char *path); |