Home
last modified time | relevance | path

Searched refs:conflict_entry (Results 1 – 23 of 23) sorted by relevance

/dports/devel/libgit2/libgit2-1.3.0/tests/index/
H A Dconflicts.c87 …cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], rep… in test_index_conflicts__add_fixes_incorrect_stage()
107 conflict_entry[1] = &our_entry; in test_index_conflicts__add_detects_invalid_filemode()
172 …cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], rep… in test_index_conflicts__add_removes_stage_zero()
187 cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], in test_index_conflicts__get()
201 cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], in test_index_conflicts__get()
224 …cl_git_pass(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], it… in test_index_conflicts__iterate()
238 …cl_git_pass(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], it… in test_index_conflicts__iterate()
252 …cl_assert(git_index_conflict_next(&conflict_entry[0], &conflict_entry[1], &conflict_entry[2], iter… in test_index_conflicts__iterate()
365 cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], in test_index_conflicts__partial()
424 cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], in test_index_conflicts__case_matters()
[all …]
/dports/devel/libgit2/libgit2-1.3.0/tests/reset/
H A Ddefault.c139 const git_index_entry *conflict_entry[3]; in test_reset_default__resetting_filepaths_clears_previous_conflicts() local
152 cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1], in test_reset_default__resetting_filepaths_clears_previous_conflicts()
153 &conflict_entry[2], _index, "conflicts-one.txt")); in test_reset_default__resetting_filepaths_clears_previous_conflicts()
160 cl_assert_equal_i(GIT_ENOTFOUND, git_index_conflict_get(&conflict_entry[0], in test_reset_default__resetting_filepaths_clears_previous_conflicts()
161 &conflict_entry[1], &conflict_entry[2], _index, "conflicts-one.txt")); in test_reset_default__resetting_filepaths_clears_previous_conflicts()
/dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/
H A Dindex.c1827 const git_index_entry *conflict_entry; in index_conflict__get_byindex() local
1839 conflict_entry = git_vector_get(&index->entries, n); in index_conflict__get_byindex()
1841 if (path && index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict__get_byindex()
1844 stage = GIT_IDXENTRY_STAGE(conflict_entry); in index_conflict__get_byindex()
1845 path = conflict_entry->path; in index_conflict__get_byindex()
1849 *their_out = conflict_entry; in index_conflict__get_byindex()
1853 *our_out = conflict_entry; in index_conflict__get_byindex()
1857 *ancestor_out = conflict_entry; in index_conflict__get_byindex()
1899 git_index_entry *conflict_entry; in index_conflict_remove() local
1908 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/cargo-c/cargo-c-0.9.6+cargo-0.58/cargo-crates/libgit2-sys-0.12.26+1.3.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/
H A Dindex.c1868 const git_index_entry *conflict_entry; in index_conflict__get_byindex() local
1880 conflict_entry = git_vector_get(&index->entries, n); in index_conflict__get_byindex()
1882 if (path && index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict__get_byindex()
1885 stage = GIT_INDEX_ENTRY_STAGE(conflict_entry); in index_conflict__get_byindex()
1886 path = conflict_entry->path; in index_conflict__get_byindex()
1890 *their_out = conflict_entry; in index_conflict__get_byindex()
1894 *our_out = conflict_entry; in index_conflict__get_byindex()
1898 *ancestor_out = conflict_entry; in index_conflict__get_byindex()
1940 git_index_entry *conflict_entry; in index_conflict_remove() local
1949 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/R-cran-git2r/git2r/src/libgit2/src/
H A Dindex.c1851 const git_index_entry *conflict_entry; in index_conflict__get_byindex() local
1863 conflict_entry = git_vector_get(&index->entries, n); in index_conflict__get_byindex()
1865 if (path && index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict__get_byindex()
1868 stage = GIT_INDEX_ENTRY_STAGE(conflict_entry); in index_conflict__get_byindex()
1869 path = conflict_entry->path; in index_conflict__get_byindex()
1873 *their_out = conflict_entry; in index_conflict__get_byindex()
1877 *our_out = conflict_entry; in index_conflict__get_byindex()
1881 *ancestor_out = conflict_entry; in index_conflict__get_byindex()
1923 git_index_entry *conflict_entry; in index_conflict_remove() local
1932 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/
H A Dindex.c1868 const git_index_entry *conflict_entry; in index_conflict__get_byindex() local
1880 conflict_entry = git_vector_get(&index->entries, n); in index_conflict__get_byindex()
1882 if (path && index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict__get_byindex()
1885 stage = GIT_INDEX_ENTRY_STAGE(conflict_entry); in index_conflict__get_byindex()
1886 path = conflict_entry->path; in index_conflict__get_byindex()
1890 *their_out = conflict_entry; in index_conflict__get_byindex()
1894 *our_out = conflict_entry; in index_conflict__get_byindex()
1898 *ancestor_out = conflict_entry; in index_conflict__get_byindex()
1940 git_index_entry *conflict_entry; in index_conflict_remove() local
1949 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/
H A Dindex.c1858 const git_index_entry *conflict_entry; in index_conflict__get_byindex() local
1870 conflict_entry = git_vector_get(&index->entries, n); in index_conflict__get_byindex()
1872 if (path && index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict__get_byindex()
1875 stage = GIT_INDEX_ENTRY_STAGE(conflict_entry); in index_conflict__get_byindex()
1876 path = conflict_entry->path; in index_conflict__get_byindex()
1880 *their_out = conflict_entry; in index_conflict__get_byindex()
1884 *our_out = conflict_entry; in index_conflict__get_byindex()
1888 *ancestor_out = conflict_entry; in index_conflict__get_byindex()
1930 git_index_entry *conflict_entry; in index_conflict_remove() local
1939 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.19+1.1.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/
H A Dindex.c1868 const git_index_entry *conflict_entry; in index_conflict__get_byindex() local
1880 conflict_entry = git_vector_get(&index->entries, n); in index_conflict__get_byindex()
1882 if (path && index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict__get_byindex()
1885 stage = GIT_INDEX_ENTRY_STAGE(conflict_entry); in index_conflict__get_byindex()
1886 path = conflict_entry->path; in index_conflict__get_byindex()
1890 *their_out = conflict_entry; in index_conflict__get_byindex()
1894 *our_out = conflict_entry; in index_conflict__get_byindex()
1898 *ancestor_out = conflict_entry; in index_conflict__get_byindex()
1940 git_index_entry *conflict_entry; in index_conflict_remove() local
1949 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/cargo-generate/cargo-generate-0.9.0/cargo-crates/libgit2-sys-0.12.22+1.1.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/textproc/mdbook-linkcheck/mdbook-linkcheck-0.7.6/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/libgit2/libgit2-1.3.0/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/textproc/bat/bat-0.18.3/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]
/dports/devel/sentry-cli/sentry-cli-1.71.0/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/
H A Dindex.c1883 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
1971 index->entries_cmp_path(conflict_entry->path, path) != 0) in index_conflict_remove()
[all …]