Commit a4ded362b415f8b3d6beaa6b9699cf3322061b5a
2015-07-26T17:19:22
iterator: skip over errors in diriter init An error here will typically mean that the directory was removed between the time we iterated the parent and the time we wanted to visit it in which case we should ignore it. Other kinds of errors such as permissions (or transient errors) also better dealt with by pretending we didn't see it.
diff --git a/src/iterator.c b/src/iterator.c
index a312afb..cf51a34 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -1027,8 +1027,11 @@ static int dirload_with_stat(
strncomp = (flags & GIT_PATH_DIR_IGNORE_CASE) != 0 ?
git__strncasecmp : git__strncmp;
- if ((error = git_path_diriter_init(&diriter, dirpath, flags)) < 0)
+ /* Any error here is equivalent to the dir not existing, skip over it */
+ if ((error = git_path_diriter_init(&diriter, dirpath, flags)) < 0) {
+ error = GIT_ENOTFOUND;
goto done;
+ }
while ((error = git_path_diriter_next(&diriter)) == 0) {
if ((error = git_path_diriter_fullpath(&path, &path_len, &diriter)) < 0)