Commit db22a91b by Edward Thomson

iterator: ignore submodule in has_ended

parent 1dc44910
...@@ -206,8 +206,7 @@ GIT_INLINE(bool) iterator_has_started( ...@@ -206,8 +206,7 @@ GIT_INLINE(bool) iterator_has_started(
return false; return false;
} }
GIT_INLINE(bool) iterator_has_ended( GIT_INLINE(bool) iterator_has_ended(git_iterator *iter, const char *path)
git_iterator *iter, const char *path, bool is_submodule)
{ {
if (iter->end == NULL) if (iter->end == NULL)
return false; return false;
...@@ -797,7 +796,7 @@ static int tree_iterator_advance(const git_index_entry **out, git_iterator *i) ...@@ -797,7 +796,7 @@ static int tree_iterator_advance(const git_index_entry **out, git_iterator *i)
continue; continue;
/* if this path is after our end, stop */ /* if this path is after our end, stop */
if (iterator_has_ended(&iter->base, iter->entry_path.ptr, false)) { if (iterator_has_ended(&iter->base, iter->entry_path.ptr)) {
error = GIT_ITEROVER; error = GIT_ITEROVER;
break; break;
} }
...@@ -2034,7 +2033,7 @@ static int index_iterator_advance( ...@@ -2034,7 +2033,7 @@ static int index_iterator_advance(
continue; continue;
} }
if (iterator_has_ended(&iter->base, entry->path, is_submodule)) { if (iterator_has_ended(&iter->base, entry->path)) {
error = GIT_ITEROVER; error = GIT_ITEROVER;
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment