| /dports/devel/libgit2/libgit2-1.3.0/tests/merge/ |
| H A D | merge_helpers.c | 17 git_commit *our_commit, *their_commit, *ancestor_commit = NULL; in merge_trees_from_branches() local
30 cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); in merge_trees_from_branches()
32 …error = git_merge_base(&ancestor_oid, repo, git_commit_id(our_commit), git_commit_id(their_commit)… in merge_trees_from_branches()
42 cl_git_pass(git_commit_tree(&their_tree, their_commit)); in merge_trees_from_branches()
51 git_commit_free(their_commit); in merge_trees_from_branches()
62 git_commit *our_commit, *their_commit; in merge_commits_from_branches() local
74 cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); in merge_commits_from_branches()
76 error = git_merge_commits(index, repo, our_commit, their_commit, opts); in merge_commits_from_branches()
80 git_commit_free(their_commit); in merge_commits_from_branches()
|
| /dports/devel/libgit2/libgit2-1.3.0/tests/merge/trees/ |
| H A D | trivial.c | 30 git_commit *our_commit, *their_commit, *ancestor_commit; in merge_trivial() local
43 cl_git_pass(git_commit_lookup(&their_commit, repo, &their_oid)); in merge_trivial()
45 …_pass(git_merge_base(&ancestor_oid, repo, git_commit_id(our_commit), git_commit_id(their_commit))); in merge_trivial()
50 cl_git_pass(git_commit_tree(&their_tree, their_commit)); in merge_trivial()
59 git_commit_free(their_commit); in merge_trivial()
|
| /dports/www/gitlab-workhorse/gitlab-foss-0a901d60f8ae4a60c04ae82e6e9c3a03e9321417/spec/lib/gitlab/conflict/ |
| H A D | file_collection_spec.rb | 18 their_commit = merge_request.target_branch_head.raw
19 custom_namespace = "#{our_commit.id}:#{their_commit.id}"
|
| /dports/www/gitlab-workhorse/gitlab-foss-0a901d60f8ae4a60c04ae82e6e9c3a03e9321417/lib/gitlab/conflict/ |
| H A D | file_collection.rb | 12 their_commit = merge_request.target_branch_head.raw
16 @their_commit_id = their_commit.id
|
| /dports/devel/py-pygit2/pygit2-1.7.1/pygit2/decl/ |
| H A D | merge.h | 67 const git_commit *their_commit,
|
| /dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/include/git2/ |
| H A D | merge.h | 559 const git_commit *their_commit,
|
| /dports/devel/sentry-cli/sentry-cli-1.71.0/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/R-cran-git2r/git2r/src/libgit2/include/git2/ |
| H A D | merge.h | 580 const git_commit *their_commit,
|
| /dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.19+1.1.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/security/cargo-audit/rustsec-cargo-audit-v0.15.2/cargo-audit/cargo-crates/libgit2-sys-0.12.23+1.2.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/cargo-generate/cargo-generate-0.9.0/cargo-crates/libgit2-sys-0.12.22+1.1.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/cargo-c/cargo-c-0.9.6+cargo-0.58/cargo-crates/libgit2-sys-0.12.26+1.3.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/sysutils/onefetch/onefetch-2.10.2/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/pijul/pijul-1.0.0.a55/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/textproc/mdbook-linkcheck/mdbook-linkcheck-0.7.6/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/lang/rust/rustc-1.58.1-src/vendor/libgit2-sys/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/sysutils/exa/exa-0.10.1/cargo-crates/libgit2-sys-0.12.18+1.1.0/libgit2/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|
| /dports/devel/libgit2/libgit2-1.3.0/include/git2/ |
| H A D | merge.h | 576 const git_commit *their_commit,
|