proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-12 01:15:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iterator: ignore submodule in has_ended

Browse Source
This commit is contained in:
Edward Thomson 2016-04-21 10:58:22 -04:00
parent 1dc449105b
commit db22a91b86
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/iterator.c
View File

@ -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)
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(
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;
} }