diff options
| author | Vicent Martà <vicent@github.com> | 2013-05-02 13:01:44 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-05-02 13:01:44 -0700 |
| commit | dc83d32ade04da29139837a24738238a10a8d0a7 (patch) | |
| tree | 0dbafbe9580d7d3ae51f30b8c9789afad7504b15 /tests-clar/merge/merge_helpers.c | |
| parent | af7689ea2489b2e92d46086a689ec074dd0854f5 (diff) | |
| parent | 4e7c15608f427466ef941cad45b27f1ad30bd25a (diff) | |
| download | libgit2-dc83d32ade04da29139837a24738238a10a8d0a7.tar.gz | |
Merge pull request #1537 from ethomson/merge_warning_cleanup
puns are not funny; type punning especially so
Diffstat (limited to 'tests-clar/merge/merge_helpers.c')
| -rw-r--r-- | tests-clar/merge/merge_helpers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests-clar/merge/merge_helpers.c b/tests-clar/merge/merge_helpers.c index 5c3421e7e..71bb96781 100644 --- a/tests-clar/merge/merge_helpers.c +++ b/tests-clar/merge/merge_helpers.c @@ -149,9 +149,9 @@ static int name_entry_eq_merge_name_entry(const struct merge_name_entry *expecte static int index_conflict_data_eq_merge_diff(const struct merge_index_conflict_data *expected, git_merge_diff *actual) { - if (!index_entry_eq_merge_index_entry((const struct merge_index_entry *)&expected->ancestor, &actual->ancestor_entry) || - !index_entry_eq_merge_index_entry((const struct merge_index_entry *)&expected->ours, &actual->our_entry) || - !index_entry_eq_merge_index_entry((const struct merge_index_entry *)&expected->theirs, &actual->their_entry)) + if (!index_entry_eq_merge_index_entry(&expected->ancestor.entry, &actual->ancestor_entry) || + !index_entry_eq_merge_index_entry(&expected->ours.entry, &actual->our_entry) || + !index_entry_eq_merge_index_entry(&expected->theirs.entry, &actual->their_entry)) return 0; if (expected->ours.status != actual->our_status || |