Lines Matching refs:conflict_entry
1883 const git_index_entry *conflict_entry; in index_conflict__get_byindex() local
1898 conflict_entry = git_vector_get(&index->entries, n); in index_conflict__get_byindex()
1900 if (path && index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict__get_byindex()
1903 stage = GIT_INDEX_ENTRY_STAGE(conflict_entry); in index_conflict__get_byindex()
1904 path = conflict_entry->path; in index_conflict__get_byindex()
1908 *their_out = conflict_entry; in index_conflict__get_byindex()
1912 *our_out = conflict_entry; in index_conflict__get_byindex()
1916 *ancestor_out = conflict_entry; in index_conflict__get_byindex()
1962 git_index_entry *conflict_entry; in index_conflict_remove() local
1968 while ((conflict_entry = git_vector_get(&index->entries, pos)) != NULL) { in index_conflict_remove()
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
1974 if (GIT_INDEX_ENTRY_STAGE(conflict_entry) == 0) { in index_conflict_remove()