fixup! Failing test for case sensitive conflicts in the index

carlosmn · carlosmn · commit bf50a68d36bb · 2015-11-11T00:52:13.000+01:00
diff --git a/tests/index/conflicts.c b/tests/index/conflicts.c
@@ -345,7 +345,7 @@ void test_index_conflicts__partial(void)
 
 void test_index_conflicts__case_matters(void)
 {
-	git_index_entry *conflict_entry[3];
+	const git_index_entry *conflict_entry[3];
 	git_oid oid;
 	char *upper_case = "DIFFERS-IN-CASE.TXT";
 	char *mixed_case = "Differs-In-Case.txt";
@@ -357,31 +357,37 @@ void test_index_conflicts__case_matters(void)
 	memset(&their_entry, 0x0, sizeof(git_index_entry));
 
 	ancestor_entry.path = upper_case;
-	ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT);
+	GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
 	git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
+	ancestor_entry.mode = GIT_FILEMODE_BLOB;
 
 	our_entry.path = upper_case;
-	ancestor_entry.flags |= (2 << GIT_IDXENTRY_STAGESHIFT);
+	GIT_IDXENTRY_STAGE_SET(&our_entry, GIT_INDEX_STAGE_OURS);
 	git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
+	our_entry.mode = GIT_FILEMODE_BLOB;
 
 	their_entry.path = upper_case;
-	ancestor_entry.flags |= (3 << GIT_IDXENTRY_STAGESHIFT);
+	GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
 	git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
+	their_entry.mode = GIT_FILEMODE_BLOB;
 
 	cl_git_pass(git_index_conflict_add(repo_index,
 		&ancestor_entry, &our_entry, &their_entry));
 
 	ancestor_entry.path = mixed_case;
-	ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT);
+	GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
 	git_oid_fromstr(&ancestor_entry.id, CONFLICTS_TWO_ANCESTOR_OID);
+	ancestor_entry.mode = GIT_FILEMODE_BLOB;
 
 	our_entry.path = mixed_case;
-	ancestor_entry.flags |= (2 << GIT_IDXENTRY_STAGESHIFT);
+	GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
 	git_oid_fromstr(&our_entry.id, CONFLICTS_TWO_OUR_OID);
+	ancestor_entry.mode = GIT_FILEMODE_BLOB;
 
 	their_entry.path = mixed_case;
-	ancestor_entry.flags |= (3 << GIT_IDXENTRY_STAGESHIFT);
+	GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
 	git_oid_fromstr(&their_entry.id, CONFLICTS_TWO_THEIR_OID);
+	their_entry.mode = GIT_FILEMODE_BLOB;
 
 	cl_git_pass(git_index_conflict_add(repo_index,
 		&ancestor_entry, &our_entry, &their_entry));
@@ -390,29 +396,29 @@ void test_index_conflicts__case_matters(void)
 		&conflict_entry[2], repo_index, upper_case));
 
 	cl_assert_equal_s(upper_case, conflict_entry[0]->path);
-	git_oid_fromstr(&oid, CONFLICTS_ONE_ANCESTOR_OID); 
+	git_oid_fromstr(&oid, CONFLICTS_ONE_ANCESTOR_OID);
 	cl_assert_equal_oid(&oid, &conflict_entry[0]->id);
 
 	cl_assert_equal_s(upper_case, conflict_entry[1]->path);
 	git_oid_fromstr(&oid, CONFLICTS_ONE_OUR_OID);
 	cl_assert_equal_oid(&oid, &conflict_entry[1]->id);
 
-	cl_assert_equal_s(upper_case, conflict_entry[0]->path);
+	cl_assert_equal_s(upper_case, conflict_entry[2]->path);
 	git_oid_fromstr(&oid, CONFLICTS_ONE_THEIR_OID);
 	cl_assert_equal_oid(&oid, &conflict_entry[2]->id);
 
 	cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1],
 		&conflict_entry[2], repo_index, mixed_case));
 
 	cl_assert_equal_s(mixed_case, conflict_entry[0]->path);
-	git_oid_fromstr(&oid, CONFLICTS_ONE_ANCESTOR_OID);
+	git_oid_fromstr(&oid, CONFLICTS_TWO_ANCESTOR_OID);
 	cl_assert_equal_oid(&oid, &conflict_entry[0]->id);
 
 	cl_assert_equal_s(mixed_case, conflict_entry[1]->path);
 	git_oid_fromstr(&oid, CONFLICTS_TWO_OUR_OID);
 	cl_assert_equal_oid(&oid, &conflict_entry[1]->id);
 
-	cl_assert_equal_s(mixed_case, conflict_entry[0]->path);
+	cl_assert_equal_s(mixed_case, conflict_entry[2]->path);
 	git_oid_fromstr(&oid, CONFLICTS_TWO_THEIR_OID);
 	cl_assert_equal_oid(&oid, &conflict_entry[2]->id);
 }
