diff options
| author | Arthur Schreiber <schreiber.arthur@googlemail.com> | 2016-02-11 23:37:52 +0100 |
|---|---|---|
| committer | Arthur Schreiber <schreiber.arthur@googlemail.com> | 2016-02-11 23:41:34 +0100 |
| commit | 3679ebaef5436a662ad74819f6cbd2c1e76e6766 (patch) | |
| tree | fac507cf5de7ba022c71c22186236f6e033ed1e8 /src/diff.c | |
| parent | 460ae11f0a8178c5d5abc55574dc3e0e312a47ea (diff) | |
| download | libgit2-3679ebaef5436a662ad74819f6cbd2c1e76e6766.tar.gz | |
Horrible fix for #3173.
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/diff.c b/src/diff.c index 67fab0763..9ac5b9250 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1371,7 +1371,7 @@ int git_diff_tree_to_index( DIFF_FROM_ITERATORS( git_iterator_for_tree(&a, old_tree, &a_opts), iflag, - git_iterator_for_index(&b, index, &b_opts), iflag + git_iterator_for_index(&b, repo, index, &b_opts), iflag ); /* if index is in case-insensitive order, re-sort deltas to match */ @@ -1395,7 +1395,7 @@ int git_diff_index_to_workdir( return error; DIFF_FROM_ITERATORS( - git_iterator_for_index(&a, index, &a_opts), + git_iterator_for_index(&a, repo, index, &a_opts), GIT_ITERATOR_INCLUDE_CONFLICTS, git_iterator_for_workdir(&b, repo, index, NULL, &b_opts), @@ -1472,8 +1472,8 @@ int git_diff_index_to_index( assert(diff && old_index && new_index); DIFF_FROM_ITERATORS( - git_iterator_for_index(&a, old_index, &a_opts), GIT_ITERATOR_DONT_IGNORE_CASE, - git_iterator_for_index(&b, new_index, &b_opts), GIT_ITERATOR_DONT_IGNORE_CASE + git_iterator_for_index(&a, repo, old_index, &a_opts), GIT_ITERATOR_DONT_IGNORE_CASE, + git_iterator_for_index(&b, repo, new_index, &b_opts), GIT_ITERATOR_DONT_IGNORE_CASE ); /* if index is in case-insensitive order, re-sort deltas to match */ |