| /dports/devel/libgit2/libgit2-1.3.0/tests/merge/workdir/ |
| H A D | setup.c | 77 git_oid our_oid; in test_merge_workdir_setup__one_branch() local
103 git_oid our_oid; in test_merge_workdir_setup__one_oid() local
127 git_oid our_oid; in test_merge_workdir_setup__two_branches() local
159 git_oid our_oid; in test_merge_workdir_setup__three_branches() local
197 git_oid our_oid; in test_merge_workdir_setup__three_oids() local
231 git_oid our_oid; in test_merge_workdir_setup__branches_and_oids_1() local
262 git_oid our_oid; in test_merge_workdir_setup__branches_and_oids_2() local
304 git_oid our_oid; in test_merge_workdir_setup__branches_and_oids_3() local
346 git_oid our_oid; in test_merge_workdir_setup__branches_and_oids_4() local
394 git_oid our_oid; in test_merge_workdir_setup__three_same_branches() local
[all …]
|
| H A D | simple.c | 670 git_oid our_oid, their_oid, our_file_oid; in test_merge_workdir_simple__binary() local
681 cl_git_pass(git_oid_fromstr(&our_oid, "cc338e4710c9b257106b8d16d82f86458d5beaf1")); in test_merge_workdir_simple__binary()
684 cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid)); in test_merge_workdir_simple__binary()
|
| /dports/devel/libgit2/libgit2-1.3.0/tests/index/ |
| H A D | reuc.c | 38 git_oid ancestor_oid, our_oid, their_oid; in test_index_reuc__add() local
42 git_oid_fromstr(&our_oid, ONE_OUR_OID); in test_index_reuc__add()
47 0100644, &our_oid, in test_index_reuc__add()
65 git_oid ancestor_oid, our_oid, their_oid; in test_index_reuc__add_no_ancestor() local
69 git_oid_fromstr(&our_oid, ONE_OUR_OID); in test_index_reuc__add_no_ancestor()
74 0100644, &our_oid, in test_index_reuc__add_no_ancestor()
204 git_oid_fromstr(&our_oid, TWO_OUR_OID); in test_index_reuc__updates_existing()
209 0100644, &our_oid, in test_index_reuc__updates_existing()
213 0100644, &our_oid, in test_index_reuc__updates_existing()
270 0100644, &our_oid, in test_index_reuc__write()
[all …]
|
| /dports/devel/libgit2/libgit2-1.3.0/tests/merge/ |
| H A D | merge_helpers.c | 19 git_oid our_oid, their_oid, ancestor_oid; in merge_trees_from_branches() local
24 cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); in merge_trees_from_branches()
25 cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid)); in merge_trees_from_branches()
63 git_oid our_oid, their_oid; in merge_commits_from_branches() local
68 cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); in merge_commits_from_branches()
69 cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid)); in merge_commits_from_branches()
|
| /dports/devel/libgit2/libgit2-1.3.0/tests/merge/trees/ |
| H A D | trivial.c | 32 git_oid our_oid, their_oid, ancestor_oid; in merge_trivial() local
37 cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); in merge_trivial()
38 cl_git_pass(git_commit_lookup(&our_commit, repo, &our_oid)); in merge_trivial()
|
| /dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/ |
| H A D | index.c | 1001 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1017 assert(our_oid); in index_entry_reuc_init()
1018 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1401 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1413 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1417 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2100 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2109 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /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 D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/ |
| H A D | index.c | 1037 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1053 assert(our_oid); in index_entry_reuc_init()
1054 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1433 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1445 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1449 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2193 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2202 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/R-cran-git2r/git2r/src/libgit2/src/ |
| H A D | index.c | 1025 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1041 assert(our_oid); in index_entry_reuc_init()
1042 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1422 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1434 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1438 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2174 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2183 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/ |
| H A D | index.c | 1037 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1053 assert(our_oid); in index_entry_reuc_init()
1054 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1433 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1445 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1449 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2193 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2202 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /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 D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/ |
| H A D | index.c | 1026 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1042 assert(our_oid); in index_entry_reuc_init()
1043 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1423 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1435 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1439 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2181 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2190 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /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 D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/ |
| H A D | index.c | 1037 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1053 assert(our_oid); in index_entry_reuc_init()
1054 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1433 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1445 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1449 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2193 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2202 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/cargo-generate/cargo-generate-0.9.0/cargo-crates/libgit2-sys-0.12.22+1.1.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/textproc/mdbook-linkcheck/mdbook-linkcheck-0.7.6/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/devel/libgit2/libgit2-1.3.0/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|
| /dports/textproc/bat/bat-0.18.3/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | index.c | 1044 int our_mode, const git_oid *our_oid, in index_entry_reuc_init() argument
1061 GIT_ASSERT(our_oid); in index_entry_reuc_init()
1062 git_oid_cpy(&reuc->oid[1], our_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1454 our_oid = conflict_entries[1] == NULL ? NULL : &conflict_entries[1]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2223 int our_mode, const git_oid *our_oid, in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|