merge: Warning noise

3 files changed, 5 insertions, 1 deletions

diff --git a/src/checkout.c b/src/checkout.c
index 96e15093c..defc21d2d 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -16,6 +16,7 @@
 #include "git2/config.h"
 #include "git2/diff.h"
 #include "git2/submodule.h"
+#include "git2/sys/index.h"
 
 #include "refs.h"
 #include "repository.h"
diff --git a/src/index.c b/src/index.c
index a935c00db..1771f2957 100644
--- a/src/index.c
+++ b/src/index.c
@@ -209,6 +209,9 @@ static int conflict_name_cmp(const void *a, const void *b)
 	return strcmp(name_a->ours, name_b->ours);
 }
 
+/**
+ * TODO: enable this when resolving case insensitive conflicts
+ */
 static int conflict_name_icmp(const void *a, const void *b)
 {
 	const git_index_name_entry *name_a = a;
diff --git a/src/merge.c b/src/merge.c
index 3595eb058..320be005a 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -1269,7 +1269,7 @@ int git_merge_diff_list__find_differences(
 	const git_tree *their_tree)
 {
 	git_iterator *iterators[3] = {0};
-	git_index_entry *items[3] = {0}, *best_cur_item, *cur_items[3];
+	const git_index_entry *items[3] = {0}, *best_cur_item, *cur_items[3];
 	git_vector_cmp entry_compare = git_index_entry__cmp;
 	struct merge_diff_df_data df_data = {0};
 	int cur_item_modified;