diff options
| author | Edward Thomson <ethomson@github.com> | 2016-02-11 15:47:01 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-02-11 15:47:01 -0800 |
| commit | 2f2129b1cea07a482aaef43b4b23f63be4c29418 (patch) | |
| tree | fac507cf5de7ba022c71c22186236f6e033ed1e8 /src/iterator.c | |
| parent | 460ae11f0a8178c5d5abc55574dc3e0e312a47ea (diff) | |
| parent | 3679ebaef5436a662ad74819f6cbd2c1e76e6766 (diff) | |
| download | libgit2-2f2129b1cea07a482aaef43b4b23f63be4c29418.tar.gz | |
Merge pull request #3612 from arthurschreiber/arthur/fix-3173
Horrible fix for #3173.
Diffstat (limited to 'src/iterator.c')
| -rw-r--r-- | src/iterator.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/iterator.c b/src/iterator.c index ee348de6e..04aac3e01 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -1080,6 +1080,7 @@ static void index_iterator__free(git_iterator *self) int git_iterator_for_index( git_iterator **iter, + git_repository *repo, git_index *index, git_iterator_options *options) { @@ -1093,7 +1094,7 @@ int git_iterator_for_index( } ii->index = index; - ITERATOR_BASE_INIT(ii, index, INDEX, git_index_owner(index)); + ITERATOR_BASE_INIT(ii, index, INDEX, repo); if ((error = iterator__update_ignore_case((git_iterator *)ii, options ? options->flags : 0)) < 0) { git_iterator_free((git_iterator *)ii); @@ -2071,7 +2072,7 @@ int git_iterator_advance_over_with_status( if (!error) continue; - + else if (error == GIT_ENOTFOUND) { /* we entered this directory only hoping to find child matches to * our pathlist (eg, this is `foo` and we had a pathlist entry for |