iterator: sort subdirs properly with pathlist

When given a pathlist, don't assume that directories sort before
files.  Walk through any list of entries sorting before us to make
sure that we've exhausted all entries that *aren't* directories.

Eg, if we're searching for 'foo/bar', and we have a 'foo.c', keep
advancing the pathlist to keep looking for an entry prefixed with
'foo/'.

1 files changed, 15 insertions, 6 deletions

diff --git a/src/iterator.c b/src/iterator.c
index 28629c708..9fa7cab2c 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -1071,13 +1071,22 @@ static dirload_pathlist_match_t dirload_pathlist_match(
 			&idx, pathlist, pathlist->_cmp, path) != GIT_ENOTFOUND)
 		return DIRLOAD_PATHLIST_EXACT;
 
-	/* the explicit path we searched for was not found, but this may be
-	 * a directory and the pathlist contains a file in it.  check.
+	/* the explicit path that we've seen in the directory iterator was
+	 * not found - however, we may have hit a subdirectory in the directory
+	 * iterator.  examine the pathlist to see if it contains children of the
+	 * current path.  if so, indicate that we've found a subdirectory that
+	 * is worth examining.
 	 */
-	if ((matched = git_vector_get(pathlist, idx)) != NULL &&
-		prefixcomp(matched, path) == 0 &&
-		matched[path_len] == '/')
-		return DIRLOAD_PATHLIST_DIRECTORY;
+	while ((matched = git_vector_get(pathlist, idx)) != NULL &&
+		prefixcomp(matched, path) == 0) {
+
+		if (matched[path_len] == '/')
+			return DIRLOAD_PATHLIST_DIRECTORY;
+		else if (matched[path_len] > '/')
+			break;
+
+		idx++;
+	}
 
 	return DIRLOAD_PATHLIST_NONE;
 }