diff options
| author | Russell Belfer <rb@github.com> | 2013-03-05 16:29:04 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-03-06 16:52:01 -0800 |
| commit | cc216a01ee512a41320056efc9b588daf9129f7a (patch) | |
| tree | ddcc5212fc7d860e61c52b70ead8f4f847b216ef /src/diff.c | |
| parent | 169dc61607b69726c6012ab70758692637928a85 (diff) | |
| download | libgit2-cc216a01ee512a41320056efc9b588daf9129f7a.tar.gz | |
Retire spoolandsort iterator
Since the case sensitivity is moved into the respective iterators,
this removes the spoolandsort iterator code.
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/diff.c b/src/diff.c index c0f8ee689..766361938 100644 --- a/src/diff.c +++ b/src/diff.c @@ -620,13 +620,8 @@ int git_diff__from_iterators( goto fail; if (diff->opts.flags & GIT_DIFF_DELTAS_ARE_ICASE) { - /* If either iterator does not have ignore_case set, then we will - * spool its data, sort it icase, and use that for the merge join - * with the other iterator which was icase sorted. This call is - * a no-op on an iterator that already matches "ignore_case". - */ - if (git_iterator_spoolandsort_push(old_iter, true) < 0 || - git_iterator_spoolandsort_push(new_iter, true) < 0) + if (git_iterator_set_ignore_case(old_iter, true) < 0 || + git_iterator_set_ignore_case(new_iter, true) < 0) goto fail; } |