log and diff family: honor config even from subdirectories

diff --git a/builtin-apply.c b/builtin-apply.c
index 8f7cf44c6945b8cfd41a36134374192e92b9789f..d924ac3d0ab663c2ceb05c2cb9943f6caa23c0ef 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2034,7 +2034,7 @@ static void create_one_file(char *path, unsigned mode, const char *buf, unsigned
                        return;
        }
 
-       if (errno == EEXIST) {
+       if (errno == EEXIST || errno == EACCES) {
                /* We may be trying to create a file where a directory
                 * used to be.
                 */