diff options
| author | Russell Belfer <rb@github.com> | 2014-02-07 11:20:36 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2014-04-17 14:43:45 -0700 |
| commit | c67fd4c9d5e1ff715df28b884d7f7f9f20fad1ec (patch) | |
| tree | 831176f87c09d36816a83ef5617623fd372f5e50 /src/merge.c | |
| parent | c5cacc4ec2c13e93164b8e3013b0d18c8c6d820c (diff) | |
| download | libgit2-c67fd4c9d5e1ff715df28b884d7f7f9f20fad1ec.tar.gz | |
Some vector utility tweaks
This is just laying some groundwork for internal index changes
that I'm working on.
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index 10c19b5c5..9c4a07b58 100644 --- a/src/merge.c +++ b/src/merge.c @@ -995,10 +995,12 @@ static void merge_diff_list_coalesce_renames( } } -static int merge_diff_empty(const git_vector *conflicts, size_t idx) +static int merge_diff_empty(const git_vector *conflicts, size_t idx, void *p) { git_merge_diff *conflict = conflicts->contents[idx]; + GIT_UNUSED(p); + return (!GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->ancestor_entry) && !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->our_entry) && !GIT_MERGE_INDEX_ENTRY_EXISTS(conflict->their_entry)); @@ -1079,7 +1081,7 @@ int git_merge_diff_list__find_renames( merge_diff_list_coalesce_renames(diff_list, similarity_ours, similarity_theirs, opts); /* And remove any entries that were merged and are now empty. */ - git_vector_remove_matching(&diff_list->conflicts, merge_diff_empty); + git_vector_remove_matching(&diff_list->conflicts, merge_diff_empty, NULL); done: if (cache != NULL) { |