diff options
Diffstat (limited to 'src/index.c')
| -rw-r--r-- | src/index.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/index.c b/src/index.c index 94427b972..6546ea18a 100644 --- a/src/index.c +++ b/src/index.c @@ -2952,7 +2952,8 @@ static int git_index_read_iterator( else if (new_length_hint) kh_resize(idx, new_entries_map, new_length_hint); - opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | + GIT_ITERATOR_INCLUDE_CONFLICTS; if ((error = git_iterator_for_index(&index_iterator, git_index_owner(index), index, &opts)) < 0 || @@ -3070,15 +3071,15 @@ int git_index_read_index( git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; int error; - opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE; + opts.flags = GIT_ITERATOR_DONT_IGNORE_CASE | + GIT_ITERATOR_INCLUDE_CONFLICTS; if ((error = git_iterator_for_index(&new_iterator, - git_index_owner(new_index), (git_index *)new_index, &opts)) < 0) + git_index_owner(new_index), (git_index *)new_index, &opts)) < 0 || + (error = git_index_read_iterator(index, new_iterator, + new_index->entries.length)) < 0) goto done; - error = git_index_read_iterator(index, new_iterator, - new_index->entries.length); - done: git_iterator_free(new_iterator); return error; |