Commit ca2857d81b5783b03d32ddc9d6f338bfec8d93dd
2015-06-10T10:30:08
merge: actually increment the counts, not the pointers `merge_diff_list_count_candidates()` takes pointers to the source and target counts, but when it comes time to increase them, we're increasing the pointer, rather than the value it's pointing to. Dereference the value to increase.
diff --git a/src/merge.c b/src/merge.c
index 28fca00..517d317 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -1143,9 +1143,9 @@ static void merge_diff_list_count_candidates(
if (GIT_MERGE_INDEX_ENTRY_EXISTS(entry->ancestor_entry) &&
(!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->our_entry) ||
!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->their_entry)))
- src_count++;
+ (*src_count)++;
else if (!GIT_MERGE_INDEX_ENTRY_EXISTS(entry->ancestor_entry))
- tgt_count++;
+ (*tgt_count)++;
}
}