Elijah Newren 75cd9ae05f merge, sequencer: switch recursive merges over to ort ...

More precisely, replace calls to merge_recursive() with
merge_ort_recursive().

Also change t7615 to quit calling out recursive; it is not needed
anymore, and we are in fact using ort now.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2025-04-08 13:59:12 -07:00

..

add.c

…

am.c

am: switch from merge_recursive_generic() to merge_ort_generic()

2025-03-18 09:49:08 -07:00

annotate.c

…

apply.c

…

archive.c

…

backfill.c

…

bisect.c

…

blame.c

…

branch.c

…

bugreport.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ignore.c

…

check-mailmap.c

…

check-ref-format.c

…

checkout--worker.c

…

checkout-index.c

builtin/checkout-index: stop using the_repository

2025-03-07 16:52:02 -08:00

checkout.c

checkout: replace merge_trees() with merge_ort_nonrecursive()

2025-04-08 13:59:11 -07:00

clean.c

…

clone.c

Merge branch 'ps/refname-avail-check-optim'

2025-03-29 16:39:07 +09:00

column.c

…

commit-graph.c

…

commit-tree.c

…

commit.c

…

config.c

…

count-objects.c

…

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

…

credential.c

…

describe.c

…

diagnose.c

…

diff-files.c

…

diff-index.c

…

diff-pairs.c

…

diff-tree.c

…

diff.c

…

difftool.c

…

fast-export.c

fast-export, fast-import: add support for signed-commits

2025-03-10 13:24:56 -07:00

fast-import.c

Merge branch 'cc/signed-fast-export-import'

2025-03-29 16:39:07 +09:00

fetch-pack.c

…

fetch.c

fetch: use ref prefix list to skip ls-refs

2025-03-10 13:13:46 -07:00

fmt-merge-msg.c

…

for-each-ref.c

builtin/for-each-ref: stop using the_repository

2025-03-07 16:52:02 -08:00

for-each-repo.c

…

fsck.c

Merge branch 'sj/ref-consistency-checks-more'

2025-03-26 16:26:10 +09:00

fsmonitor--daemon.c

…

gc.c

…

get-tar-commit-id.c

…

grep.c

…

hash-object.c

…

help.c

…

hook.c

…

index-pack.c

…

init-db.c

…

interpret-trailers.c

…

log.c

…

ls-files.c

builtin/ls-files: stop using the_repository

2025-03-07 16:52:01 -08:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

…

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

builtin/merge-recursive: switch to using merge_ort_generic()

2025-04-08 13:59:11 -07:00

merge-tree.c

…

merge.c

merge, sequencer: switch recursive merges over to ort

2025-04-08 13:59:12 -07:00

mktag.c

…

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

…

notes.c

…

pack-objects.c

builtin/pack-objects.c: freshen objects from existing cruft packs

2025-03-13 11:48:04 -07:00

pack-redundant.c

…

pack-refs.c

builtin/pack-refs: stop using the_repository

2025-03-07 16:52:01 -08:00

patch-id.c

…

prune-packed.c

…

prune.c

…

pull.c

…

push.c

…

range-diff.c

…

read-tree.c

…

rebase.c

…

receive-pack.c

…

reflog.c

…

refs.c

Merge branch 'sj/ref-consistency-checks-more'

2025-03-26 16:26:10 +09:00

remote-ext.c

…

remote-fd.c

…

remote.c

…

repack.c

…

replace.c

…

replay.c

…

rerere.c

…

reset.c

…

rev-list.c

…

rev-parse.c

…

revert.c

…

rm.c

…

send-pack.c

builtin/send-pack: stop using the_repository

2025-03-07 16:52:01 -08:00

shortlog.c

…

show-branch.c

…

show-index.c

…

show-ref.c

…

sparse-checkout.c

…

stash.c

stash: remove merge-recursive.h include

2025-03-17 15:39:03 -07:00

stripspace.c

…

submodule--helper.c

…

symbolic-ref.c

…

tag.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

builtin/update-ref: skip ambiguity checks when parsing object IDs

2025-03-12 11:31:17 -07:00

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

builtin/verify-commit: stop using the_repository

2025-03-07 16:52:01 -08:00

verify-pack.c

…

verify-tag.c

builtin/verify-tag: stop using the_repository

2025-03-07 16:52:01 -08:00

worktree.c

…

write-tree.c

…