diff options
| author | Russell Belfer <rb@github.com> | 2014-02-10 13:20:08 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2014-04-17 14:43:45 -0700 |
| commit | 3b4c401a38ce912d5be8c9bf4ab1c4912a4f08bd (patch) | |
| tree | 4961b64fd558e1e55e9d1d96b37ca575c42ce008 /src/merge.c | |
| parent | dac160489bbf8de90d2f1ae152df68ded2603598 (diff) | |
| download | libgit2-3b4c401a38ce912d5be8c9bf4ab1c4912a4f08bd.tar.gz | |
Decouple index iterator sort from index
This makes the index iterator honor the GIT_ITERATOR_IGNORE_CASE
and GIT_ITERATOR_DONT_IGNORE_CASE flags without modifying the
index data itself. To take advantage of this, I had to export a
number of the internal index entry comparison functions. I also
wrote some new tests to exercise the capability.
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 9c4a07b58..68105d483 100644 --- a/src/merge.c +++ b/src/merge.c @@ -1332,7 +1332,7 @@ int git_merge_diff_list__find_differences( { git_iterator *iterators[3] = {0}; const git_index_entry *items[3] = {0}, *best_cur_item, *cur_items[3]; - git_vector_cmp entry_compare = git_index_entry__cmp; + git_vector_cmp entry_compare = git_index_entry_cmp; struct merge_diff_df_data df_data = {0}; int cur_item_modified; size_t i, j; |