Junio C Hamano c3ebf18eb2 Merge branch 'en/merge-recursive-debug' ...

Remove remnants of the recursive merge strategy backend, which was
superseded by the ort merge strategy.

* en/merge-recursive-debug:
  builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM
  tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm
  merge-recursive.[ch]: thoroughly debug these
  merge, sequencer: switch recursive merges over to ort
  sequencer: switch non-recursive merges over to ort
  merge-ort: enable diff-algorithms other than histogram
  builtin/merge-recursive: switch to using merge_ort_generic()
  checkout: replace merge_trees() with merge_ort_nonrecursive()

2025-04-17 10:28:18 -07:00

..

add.c

global: trivial conversions to fix -Wsign-compare warnings

2024-12-06 20:20:04 +09:00

am.c

am: switch from merge_recursive_generic() to merge_ort_generic()

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

annotate.c

Merge branch 'jc/a-commands-without-the-repo'

2024-10-25 14:02:36 -04:00

apply.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

archive.c

archive: remove the_repository global variable

2024-10-11 09:37:18 -07:00

backfill.c

Merge branch 'ds/backfill'

2025-02-18 15:30:31 -08:00

bisect.c

global: mark code units that generate warnings with -Wsign-compare

2024-12-06 20:20:02 +09:00

blame.c

blame: print unblamable and ignored commits in porcelain mode

2025-04-07 14:50:18 -07:00

branch.c

Merge branch 'rs/ref-fitler-used-atoms-value-fix'

2025-01-29 14:05:09 -08:00

bugreport.c

Merge branch 'ua/os-version-capability'

2025-02-27 15:23:00 -08:00

bundle.c

Merge branch 'jt/bundle-fsck'

2024-12-13 07:33:36 -08:00

cat-file.c

builtin/cat-file: use bitmaps to efficiently filter by object type

2025-04-07 14:43:52 -07:00

check-attr.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

check-ignore.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

check-mailmap.c

mailmap: fix check-mailmap with full mailmap line

2025-02-21 18:27:16 -08:00

check-ref-format.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

checkout--worker.c

builtins: send usage_with_options() help text to standard output

2025-01-17 13:30:03 -08:00

checkout-index.c

builtin/checkout-index: stop using the_repository

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

checkout.c

Merge branch 'en/merge-recursive-debug'

2025-04-17 10:28:18 -07:00

clean.c

global: mark code units that generate warnings with -Wsign-compare

2024-12-06 20:20:02 +09:00

clone.c

Merge branch 'jt/clone-guess-remote-head-fix'

2025-04-15 13:50:16 -07:00

column.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

commit-graph.c

progress: stop using the_repository

2024-12-18 10:44:30 -08:00

commit-tree.c

builtins: send usage_with_options() help text to standard output

2025-01-17 13:30:03 -08:00

commit.c

path: drop git_path() in favor of repo_git_path()

2025-02-28 13:54:11 -08:00

config.c

path: drop git_pathdup() in favor of repo_git_path()

2025-02-07 09:59:22 -08:00

count-objects.c

packfile: pass down repository to has_object[_kept]_pack

2024-12-04 08:21:54 +09:00

credential-cache--daemon.c

Merge branch 'mh/credential-cache-authtype-request-fix'

2025-01-28 13:02:24 -08:00

credential-cache.c

Merge branch 'rj/cygwin-exit'

2024-11-01 12:53:19 -04:00

credential-store.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

credential.c

Merge branch 'jc/show-usage-help'

2025-01-28 13:02:22 -08:00

describe.c

hash: stop depending on the_repository in null_oid()

2025-03-10 13:16:20 -07:00

diagnose.c

diagnose: stop using the_repository

2024-12-18 10:44:31 -08:00

diff-files.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

diff-index.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

diff-pairs.c

builtin/diff-pairs: allow explicit diff queue flush

2025-03-03 08:17:47 -08:00

diff-tree.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

diff.c

hash: stop depending on the_repository in null_oid()

2025-03-10 13:16:20 -07:00

difftool.c

difftool: eliminate use of USE_THE_REPOSITORY_VARIABLE

2025-02-06 13:00:21 -08:00

fast-export.c

Merge branch 'ps/object-wo-the-repository'

2025-04-15 13:50:15 -07:00

fast-import.c

Merge branch 'ps/object-wo-the-repository'

2025-04-15 13:50:15 -07:00

fetch-pack.c

oddballs: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

fetch.c

Merge branch 'jk/fetch-follow-remote-head-fix'

2025-04-17 10:28:17 -07:00

fmt-merge-msg.c

Merge branch 'jc/pass-repo-to-builtins'

2024-09-23 10:35:09 -07:00

for-each-ref.c

builtin/for-each-ref: stop using the_repository

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

for-each-repo.c

global: trivial conversions to fix -Wsign-compare warnings

2024-12-06 20:20:04 +09:00

fsck.c

Merge branch 'ps/object-wo-the-repository'

2025-04-15 13:50:15 -07:00

fsmonitor--daemon.c

builtins: send usage_with_options() help text to standard output

2025-01-17 13:30:03 -08:00

gc.c

Merge branch 'ps/maintenance-reflog-expire'

2025-04-16 13:54:19 -07:00

get-tar-commit-id.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

grep.c

hash: stop depending on the_repository in null_oid()

2025-03-10 13:16:20 -07:00

hash-object.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

help.c

pager: stop using the_repository

2024-12-18 10:44:30 -08:00

hook.c

builtin: pass repository to sub commands

2024-11-26 10:36:08 +09:00

index-pack.c

Merge branch 'ps/object-wo-the-repository'

2025-04-15 13:50:15 -07:00

init-db.c

environment: move access to "core.sharedRepository" into repo settings

2025-02-28 13:54:11 -08:00

interpret-trailers.c

trailer: spread usage of "trailer_block" language

2024-10-14 12:33:02 -04:00

log.c

object: stop depending on the_repository

2025-03-10 13:16:18 -07:00

ls-files.c

Merge branch 'ps/object-wo-the-repository'

2025-04-15 13:50:15 -07:00

ls-remote.c

builtin/ls-remote: plug leaking server options

2024-11-04 22:37:51 -08:00

ls-tree.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

mailinfo.c

mailinfo: stop using the_repository

2024-12-18 10:44:31 -08:00

mailsplit.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

merge-base.c

commit-reach: use size_t to track indices when computing merge bases

2024-12-27 08:12:40 -08:00

merge-file.c

global: mark code units that generate warnings with -Wsign-compare

2024-12-06 20:20:02 +09:00

merge-index.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

merge-ours.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

merge-recursive.c

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

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

merge-tree.c

merge-tree: only use basic merge config

2025-02-18 09:52:39 -08:00

merge.c

builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

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

mktag.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

mktree.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

multi-pack-index.c

midx-write: pass down repository to write_midx_file[_only]

2024-12-04 10:32:20 +09:00

mv.c

global: mark code units that generate warnings with -Wsign-compare

2024-12-06 20:20:02 +09:00

name-rev.c

Merge branch 'ps/object-wo-the-repository'

2025-04-15 13:50:15 -07:00

notes.c

path: drop git_path() in favor of repo_git_path()

2025-02-28 13:54:11 -08:00

pack-objects.c

Merge branch 'ps/cat-file-filter-batch'

2025-04-16 13:54:21 -07:00

pack-redundant.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

pack-refs.c

builtin/pack-refs: stop using the_repository

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

patch-id.c

global: adapt callers to use generic hash context helpers

2025-01-31 10:06:11 -08:00

prune-packed.c

builtin: remove USE_THE_REPOSITORY for those without the_repository

2024-09-13 14:33:30 -07:00

prune.c

object: stop depending on the_repository

2025-03-10 13:16:18 -07:00

pull.c

refspec: replace refspec_item_init() with fetch/push variants

2025-03-21 01:45:16 -07:00

push.c

remote: rename query_refspecs functions

2025-02-04 09:51:41 -08:00

range-diff.c

Merge branch 'js/range-diff-diff-merges'

2024-12-23 09:32:17 -08:00

read-tree.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

rebase.c

Merge branch 'en/merge-recursive-debug'

2025-04-17 10:28:18 -07:00

receive-pack.c

hash: stop depending on the_repository in null_oid()

2025-03-10 13:16:20 -07:00

reflog.c

Merge branch 'ps/maintenance-reflog-expire'

2025-04-16 13:54:19 -07:00

refs.c

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

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

remote-ext.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

remote-fd.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

remote.c

remote: allow guess_remote_head() to suppress advice

2025-03-25 16:09:27 -07:00

repack.c

repack: begin combining cruft packs with --combine-cruft-below-size

2025-03-21 03:42:07 -07:00

replace.c

path: drop git_pathdup() in favor of repo_git_path()

2025-02-07 09:59:22 -08:00

replay.c

parse-options: introduce die_for_incompatible_opt2()

2025-02-06 12:23:54 -08:00

rerere.c

rerere: let rerere_path() write paths into a caller-provided buffer

2025-02-28 13:54:11 -08:00

reset.c

diff.h: fix index used to loop through unsigned integer

2024-12-06 20:20:03 +09:00

rev-list.c

Merge branch 'ps/cat-file-filter-batch'

2025-04-16 13:54:21 -07:00

rev-parse.c

path: drop git_path() in favor of repo_git_path()

2025-02-28 13:54:11 -08:00

revert.c

builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

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

rm.c

rm: fix sign comparison warnings

2025-03-29 01:04:40 -07:00

send-pack.c

builtin/send-pack: stop using the_repository

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

shortlog.c

diff.h: fix index used to loop through unsigned integer

2024-12-06 20:20:03 +09:00

show-branch.c

global: mark code units that generate warnings with -Wsign-compare

2024-12-06 20:20:02 +09:00

show-index.c

Merge branch 'jc/show-index-h-update'

2025-01-31 09:44:16 -08:00

show-ref.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

sparse-checkout.c

global: mark code units that generate warnings with -Wsign-compare

2024-12-06 20:20:02 +09:00

stash.c

stash: remove merge-recursive.h include

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

stripspace.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

submodule--helper.c

hash: stop depending on the_repository in null_oid()

2025-03-10 13:16:20 -07:00

symbolic-ref.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

tag.c

object-file-convert: stop depending on the_repository

2025-03-10 13:16:19 -07:00

unpack-file.c

oddballs: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

unpack-objects.c

Merge branch 'ps/object-wo-the-repository'

2025-04-15 13:50:15 -07:00

update-index.c

builtins: send usage_with_options() help text to standard output

2025-01-17 13:30:03 -08:00

update-ref.c

Merge branch 'kn/non-transactional-batch-updates'

2025-04-16 13:54:19 -07:00

update-server-info.c

builtin/update-server-info: remove the_repository global variable

2025-02-10 16:20:21 -08:00

upload-archive.c

builtin: send usage() help text to standard output

2025-01-17 13:30:03 -08:00

upload-pack.c

serve: stop using the_repository

2024-12-18 10:44:30 -08:00

var.c

Merge branch 'jc/show-usage-help'

2025-01-28 13:02:22 -08:00

verify-commit.c

builtin/verify-commit: stop using the_repository

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

verify-pack.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07:00

verify-tag.c

builtin/verify-tag: stop using the_repository

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

worktree.c

hash: stop depending on the_repository in null_oid()

2025-03-10 13:16:20 -07:00

write-tree.c

Merge branch 'jc/pass-repo-to-builtins'

2024-09-23 10:35:09 -07:00