Merge branch 'ks/difftool-dir-diff-copy-fix' into maint

diff --git a/git-compat-util.h b/git-compat-util.h
index e955bb5e8b3101cc8c753cf541beabf5cd037b39..c1f8a477fb96730612e1ddd06294270a4651649f 100644 (file)
--- 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);