| /dports/devel/cgit/cgit-1.2.3/git/builtin/ |
| H A D | pull.c | 579 static int pull_into_void(const struct object_id *merge_head, in pull_into_void() argument
585 commit = lookup_commit(the_repository, merge_head); in pull_into_void()
588 oid_to_hex(merge_head)); in pull_into_void()
601 merge_head, 0)) in pull_into_void()
801 const struct object_id *merge_head, in get_octopus_merge_base() argument
832 const struct object_id *merge_head, in run_rebase() argument
870 argv_array_push(&args, oid_to_hex(merge_head)); in run_rebase()
875 argv_array_push(&args, oid_to_hex(merge_head)); in run_rebase()
995 struct commit *merge_head, *head; in cmd_pull() local
1000 merge_head = lookup_commit_reference(the_repository, in cmd_pull()
[all …]
|
| /dports/devel/git-gui/git-2.34.1/builtin/ |
| H A D | pull.c | 592 static int pull_into_void(const struct object_id *merge_head, in pull_into_void() argument
598 commit = lookup_commit(the_repository, merge_head); in pull_into_void()
601 oid_to_hex(merge_head)); in pull_into_void()
615 merge_head, 0)) in pull_into_void()
821 const struct object_id *merge_head, in get_octopus_merge_base() argument
854 const struct object_id *merge_head, in get_rebase_newbase_and_upstream() argument
866 oidcpy(upstream, merge_head); in get_rebase_newbase_and_upstream()
868 oidcpy(newbase, merge_head); in get_rebase_newbase_and_upstream()
925 struct commit *merge_head, *head; in get_can_ff() local
934 merge_head = lookup_commit_reference(the_repository, orig_merge_head); in get_can_ff()
[all …]
|
| /dports/devel/git-p4/git-2.34.1/builtin/ |
| H A D | pull.c | 592 static int pull_into_void(const struct object_id *merge_head, in pull_into_void() argument
598 commit = lookup_commit(the_repository, merge_head); in pull_into_void()
601 oid_to_hex(merge_head)); in pull_into_void()
615 merge_head, 0)) in pull_into_void()
821 const struct object_id *merge_head, in get_octopus_merge_base() argument
854 const struct object_id *merge_head, in get_rebase_newbase_and_upstream() argument
866 oidcpy(upstream, merge_head); in get_rebase_newbase_and_upstream()
868 oidcpy(newbase, merge_head); in get_rebase_newbase_and_upstream()
925 struct commit *merge_head, *head; in get_can_ff() local
934 merge_head = lookup_commit_reference(the_repository, orig_merge_head); in get_can_ff()
[all …]
|
| /dports/devel/git/git-2.34.1/builtin/ |
| H A D | pull.c | 592 static int pull_into_void(const struct object_id *merge_head, in pull_into_void() argument
598 commit = lookup_commit(the_repository, merge_head); in pull_into_void()
601 oid_to_hex(merge_head)); in pull_into_void()
615 merge_head, 0)) in pull_into_void()
821 const struct object_id *merge_head, in get_octopus_merge_base() argument
854 const struct object_id *merge_head, in get_rebase_newbase_and_upstream() argument
866 oidcpy(upstream, merge_head); in get_rebase_newbase_and_upstream()
868 oidcpy(newbase, merge_head); in get_rebase_newbase_and_upstream()
925 struct commit *merge_head, *head; in get_can_ff() local
934 merge_head = lookup_commit_reference(the_repository, orig_merge_head); in get_can_ff()
[all …]
|
| /dports/devel/git-cvs/git-2.34.1/builtin/ |
| H A D | pull.c | 592 static int pull_into_void(const struct object_id *merge_head, in pull_into_void() argument
598 commit = lookup_commit(the_repository, merge_head); in pull_into_void()
601 oid_to_hex(merge_head)); in pull_into_void()
615 merge_head, 0)) in pull_into_void()
821 const struct object_id *merge_head, in get_octopus_merge_base() argument
854 const struct object_id *merge_head, in get_rebase_newbase_and_upstream() argument
866 oidcpy(upstream, merge_head); in get_rebase_newbase_and_upstream()
868 oidcpy(newbase, merge_head); in get_rebase_newbase_and_upstream()
925 struct commit *merge_head, *head; in get_can_ff() local
934 merge_head = lookup_commit_reference(the_repository, orig_merge_head); in get_can_ff()
[all …]
|
| /dports/devel/git-svn/git-2.34.1/builtin/ |
| H A D | pull.c | 592 static int pull_into_void(const struct object_id *merge_head, in pull_into_void() argument
598 commit = lookup_commit(the_repository, merge_head); in pull_into_void()
601 oid_to_hex(merge_head)); in pull_into_void()
615 merge_head, 0)) in pull_into_void()
821 const struct object_id *merge_head, in get_octopus_merge_base() argument
854 const struct object_id *merge_head, in get_rebase_newbase_and_upstream() argument
866 oidcpy(upstream, merge_head); in get_rebase_newbase_and_upstream()
868 oidcpy(newbase, merge_head); in get_rebase_newbase_and_upstream()
925 struct commit *merge_head, *head; in get_can_ff() local
934 merge_head = lookup_commit_reference(the_repository, orig_merge_head); in get_can_ff()
[all …]
|
| /dports/www/chromium-legacy/chromium-88.0.4324.182/remoting/host/installer/linux/ |
| H A D | build-deb.sh | 106 merge_head="$(git merge-base HEAD origin/git-svn 2>/dev/null || true)"
107 if [[ -n "$merge_head" ]]; then
108 revision="$(git svn find-rev "$merge_head" 2>/dev/null || true)"
|
| /dports/editors/emacs/emacs-27.2/build-aux/git-hooks/ |
| H A D | pre-commit | 33 for merge_head in $merge_heads; do
35 HEAD) head=$merge_head;;
|
| /dports/editors/emacs-devel/emacs-4d1968b/build-aux/git-hooks/ |
| H A D | pre-commit | 33 for merge_head in $merge_heads; do
35 HEAD) head=$merge_head;;
|
| /dports/devel/hs-git-annex/git-annex-8.20210903/Command/ |
| H A D | ResolveMerge.hs | 30 let merge_head = d </> "MERGE_HEAD" function
32 <$> liftIO (S.readFile merge_head)
|
| /dports/graphics/blender/blender-2.91.0/source/tools/utils/ |
| H A D | blender_merge_format_changes.py | 57 merge_head = get_string(['git', 'rev-parse', '--git-path', 'MERGE_HEAD']) variable
60 os.path.exists(merge_head):
|
| /dports/www/gitlab-workhorse/gitlab-foss-0a901d60f8ae4a60c04ae82e6e9c3a03e9321417/spec/models/ |
| H A D | merge_request_diff_spec.rb | 66 it { expect(merge_head).to be_valid }
67 it { expect(merge_head).to be_persisted }
68 it { expect(merge_head.commits.count).to eq(30) }
69 it { expect(merge_head.diffs.count).to eq(20) }
70 … it { expect(merge_head.head_commit_sha).to eq(merge_request.merge_ref_head.diff_refs.head_sha) }
71 … it { expect(merge_head.base_commit_sha).to eq(merge_request.merge_ref_head.diff_refs.base_sha) }
72 it { expect(merge_head.start_commit_sha).to eq(merge_request.target_branch_sha) }
144 …dated.id, latest.id, closed.id, merged.id, closed_recently.id, merged_recently.id, merge_head.id) }
151 is_expected.to contain_exactly(outdated.id, latest.id, closed.id, merged.id, merge_head.id)
|
| /dports/devel/interactive_rebase_tool/git-interactive-rebase-tool-1.2.1/cargo-crates/libgit2-sys-0.7.11/libgit2/src/ |
| H A D | merge.c | 2479 const git_annotated_commit *merge_head; member
2490 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2491 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2502 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2503 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2515 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2525 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2537 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2689 entries[i].merge_head = heads[i]; in write_merge_msg()
2713 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[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 D | merge.c | 2530 const git_annotated_commit *merge_head; member
2541 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2542 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2553 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2554 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2566 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2576 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2588 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2741 entries[i].merge_head = heads[i]; in write_merge_msg()
2765 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/misc/broot/broot-1.7.0/cargo-crates/libgit2-sys-0.12.21+1.1.0/libgit2/src/ |
| H A D | merge.c | 2516 const git_annotated_commit *merge_head; member
2527 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2528 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2539 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2540 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2552 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2562 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2574 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2727 entries[i].merge_head = heads[i]; in write_merge_msg()
2751 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/devel/git-absorb/git-absorb-0.6.6/cargo-crates/libgit2-sys-0.12.13+1.0.1/libgit2/src/ |
| H A D | merge.c | 2493 const git_annotated_commit *merge_head; member
2504 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2505 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2516 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2517 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2529 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2539 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2551 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2703 entries[i].merge_head = heads[i]; in write_merge_msg()
2727 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/devel/R-cran-git2r/git2r/src/libgit2/src/ |
| H A D | merge.c | 2479 const git_annotated_commit *merge_head; member
2490 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2491 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2502 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2503 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2515 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2525 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2537 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2689 entries[i].merge_head = heads[i]; in write_merge_msg()
2713 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/devel/git-delta/delta-0.9.2/cargo-crates/libgit2-sys-0.12.24+1.3.0/libgit2/src/ |
| H A D | merge.c | 2530 const git_annotated_commit *merge_head; member
2541 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2542 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2553 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2554 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2566 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2576 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2588 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2741 entries[i].merge_head = heads[i]; in write_merge_msg()
2765 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/sysutils/vector/vector-0.10.0/cargo-crates/libgit2-sys-0.12.7+1.0.0/libgit2/src/ |
| H A D | merge.c | 2493 const git_annotated_commit *merge_head; member
2504 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2505 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2516 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2517 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2529 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2539 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2551 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2703 entries[i].merge_head = heads[i]; in write_merge_msg()
2727 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[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 D | merge.c | 2527 const git_annotated_commit *merge_head; member
2538 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2539 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2550 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2551 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2563 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2573 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2585 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2738 entries[i].merge_head = heads[i]; in write_merge_msg()
2762 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/devel/tokei/tokei-12.1.2/cargo-crates/libgit2-sys-0.12.17+1.1.0/libgit2/src/ |
| H A D | merge.c | 2513 const git_annotated_commit *merge_head; member
2524 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2525 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2536 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2537 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2549 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2559 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2571 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2724 entries[i].merge_head = heads[i]; in write_merge_msg()
2748 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/devel/gbump/gbump-1.0.1/cargo-crates/libgit2-sys-0.9.1/libgit2/src/ |
| H A D | merge.c | 2471 const git_annotated_commit *merge_head; member
2482 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2483 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2494 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2495 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2507 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2517 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2529 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2681 entries[i].merge_head = heads[i]; in write_merge_msg()
2705 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/devel/libgit2/libgit2-1.3.0/src/ |
| H A D | merge.c | 2530 const git_annotated_commit *merge_head; member
2541 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2542 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2553 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2554 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2566 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2576 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2588 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2741 entries[i].merge_head = heads[i]; in write_merge_msg()
2765 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|
| /dports/devel/gitui/gitui-0.10.1/cargo-crates/libgit2-sys-0.12.12+1.0.1/libgit2/src/ |
| H A D | merge.c | 2493 const git_annotated_commit *merge_head; member
2504 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2505 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2516 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2517 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2529 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2539 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2551 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2703 entries[i].merge_head = heads[i]; in write_merge_msg()
2727 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[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 D | merge.c | 2513 const git_annotated_commit *merge_head; member
2524 entry->merge_head->remote_url == NULL && in msg_entry_is_branch()
2525 entry->merge_head->ref_name != NULL && in msg_entry_is_branch()
2536 entry->merge_head->remote_url == NULL && in msg_entry_is_tracking()
2537 entry->merge_head->ref_name != NULL && in msg_entry_is_tracking()
2549 entry->merge_head->ref_name != NULL && in msg_entry_is_tag()
2559 entry->merge_head->ref_name != NULL && in msg_entry_is_remote()
2571 entry->merge_head->remote_url) == 0); in msg_entry_is_remote()
2724 entries[i].merge_head = heads[i]; in write_merge_msg()
2748 entries[i].merge_head->id_str)) < 0) in write_merge_msg()
[all …]
|