| /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
43 git_oid_fromstr(&their_oid, ONE_THEIR_OID); in test_index_reuc__add()
48 0100644, &their_oid)); in test_index_reuc__add()
65 git_oid ancestor_oid, our_oid, their_oid; in test_index_reuc__add_no_ancestor() local
70 git_oid_fromstr(&their_oid, ONE_THEIR_OID); in test_index_reuc__add_no_ancestor()
75 0100644, &their_oid)); in test_index_reuc__add_no_ancestor()
210 0100644, &their_oid)); in test_index_reuc__updates_existing()
214 0100644, &their_oid, in test_index_reuc__updates_existing()
258 git_oid ancestor_oid, our_oid, their_oid; in test_index_reuc__write() local
271 0100644, &their_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
29 cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr)); in merge_trees_from_branches()
30 cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); in merge_trees_from_branches()
63 git_oid our_oid, their_oid; in merge_commits_from_branches() local
73 cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr)); in merge_commits_from_branches()
74 cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); in merge_commits_from_branches()
|
| /dports/devel/libgit2/libgit2-1.3.0/tests/merge/workdir/ |
| H A D | simple.c | 175 git_oid their_oid; in test_merge_workdir_simple__index_reload() local
191 cl_git_pass(git_oid_fromstr(&their_oid, THEIRS_SIMPLE_OID)); in test_merge_workdir_simple__index_reload()
192 cl_git_pass(git_annotated_commit_lookup(&their_heads[0], repo, &their_oid)); in test_merge_workdir_simple__index_reload()
670 git_oid our_oid, their_oid, our_file_oid; in test_merge_workdir_simple__binary() local
682 cl_git_pass(git_oid_fromstr(&their_oid, "ad01aebfdf2ac13145efafe3f9fcf798882f1730")); in test_merge_workdir_simple__binary()
687 cl_git_pass(git_annotated_commit_lookup(&their_head, repo, &their_oid)); in test_merge_workdir_simple__binary()
|
| /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
42 cl_git_pass(git_reference_name_to_id(&their_oid, repo, branch_buf.ptr)); in merge_trivial()
43 cl_git_pass(git_commit_lookup(&their_commit, repo, &their_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 | 1002 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1022 assert(their_oid); in index_entry_reuc_init()
1023 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1401 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1414 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1417 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2101 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1038 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1058 assert(their_oid); in index_entry_reuc_init()
1059 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1433 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1446 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1449 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2194 int their_mode, const git_oid *their_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 | 1026 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1046 assert(their_oid); in index_entry_reuc_init()
1047 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1422 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1435 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1438 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2175 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1038 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1058 assert(their_oid); in index_entry_reuc_init()
1059 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1433 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1446 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1449 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2194 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1027 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1047 assert(their_oid); in index_entry_reuc_init()
1048 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1423 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1436 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1439 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2182 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1038 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1058 assert(their_oid); in index_entry_reuc_init()
1059 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1433 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1446 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1449 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2194 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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 | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_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/sentry-cli/sentry-cli-1.71.0/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/src/ |
| H A D | index.c | 1045 int their_mode, const git_oid *their_oid) in index_entry_reuc_init() argument
1066 GIT_ASSERT(their_oid); in index_entry_reuc_init()
1067 git_oid_cpy(&reuc->oid[2], their_oid); in index_entry_reuc_init()
1442 git_oid const *ancestor_oid, *our_oid, *their_oid; in index_conflict_to_reuc() local
1455 their_oid = conflict_entries[2] == NULL ? NULL : &conflict_entries[2]->id; in index_conflict_to_reuc()
1458 our_mode, our_oid, their_mode, their_oid)) >= 0) in index_conflict_to_reuc()
2224 int their_mode, const git_oid *their_oid) in git_index_reuc_add() argument
2233 ancestor_oid, our_mode, our_oid, their_mode, their_oid)) < 0 || in git_index_reuc_add()
|