Phillip Wood 54cf5d2da8 merge-tree: only use basic merge config ...

Commit 9c93ba4d0a (merge-recursive: honor diff.algorithm, 2024-07-13)
replaced init_merge_options() with init_basic_merge_config() for use in
plumbing commands and init_ui_merge_config() for use in porcelain
commands. As "git merge-tree" is a plumbing command it should call
init_basic_merge_config() rather than init_ui_merge_config(). The merge
ort machinery ignores "diff.algorithm" so the behavior is unchanged by
this commit but it future proofs us against any future changes to
init_ui_merge_config().

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

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

..

add.c

global: trivial conversions to fix -Wsign-compare warnings

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

am.c

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

2024-12-06 20:20:03 +09: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

bisect.c

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

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

blame.c

builtin/blame: fix out-of-bounds write with blank boundary commits

2025-01-10 06:56:55 -08:00

branch.c

Merge branch 'ps/build-sign-compare'

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

bugreport.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

bundle.c

Merge branch 'jt/bundle-fsck'

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

cat-file.c

Merge branch 'ps/build-sign-compare'

2024-12-23 09:32:11 -08: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

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

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

check-ref-format.c

refs: drop strbuf_ prefix from helpers

2024-12-03 12:38:49 +09:00

checkout--worker.c

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

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

checkout-index.c

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

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

checkout.c

Merge branch 'ps/build-sign-compare'

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

clean.c

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

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

clone.c

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

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

column.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

commit-graph.c

builtin: pass repository to sub commands

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

commit-tree.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

commit.c

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

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

config.c

builtin: pass repository to sub commands

2024-11-26 10:36:08 +09: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

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07: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

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

describe.c

Merge branch 'ps/build-sign-compare'

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

diagnose.c

builtin: remove USE_THE_REPOSITORY for those without the_repository

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

diff-files.c

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

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

diff-index.c

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

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

diff-tree.c

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

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

diff.c

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

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

difftool.c

global: trivial conversions to fix -Wsign-compare warnings

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

fast-export.c

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

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

fast-import.c

Merge branch 'ps/weak-sha1-for-tail-sum-fix'

2025-01-01 09:21:14 -08:00

fetch-pack.c

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

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

fetch.c

Merge branch 'bf/fetch-set-head-config'

2025-01-06 12:02:21 -08:00

fmt-merge-msg.c

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

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

for-each-ref.c

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

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

for-each-repo.c

global: trivial conversions to fix -Wsign-compare warnings

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

fsck.c

packfile: pass down repository to for_each_packed_object

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

fsmonitor--daemon.c

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

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

gc.c

Merge branch 'ps/build-sign-compare'

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

get-tar-commit-id.c

builtin: remove USE_THE_REPOSITORY for those without the_repository

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

grep.c

Revert barrier-based LSan threading race workaround

2025-01-01 14:13:01 -08:00

hash-object.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

help.c

global: trivial conversions to fix -Wsign-compare warnings

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

hook.c

builtin: pass repository to sub commands

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

index-pack.c

Revert barrier-based LSan threading race workaround

2025-01-01 14:13:01 -08:00

init-db.c

builtin/init-db: fix leaking directory paths

2024-11-21 08:23:45 +09:00

interpret-trailers.c

trailer: spread usage of "trailer_block" language

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

log.c

Merge branch 'ps/build-sign-compare'

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

ls-files.c

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

2024-12-06 20:20:02 +09: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

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

mailsplit.c

global: trivial conversions to fix -Wsign-compare warnings

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

merge-base.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

2024-09-13 14:32:24 -07: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

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

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

merge-ours.c

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

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

merge-recursive.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

merge-tree.c

merge-tree: only use basic merge config

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

merge.c

Merge branch 'ps/build-sign-compare'

2024-12-23 09:32:11 -08: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

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

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

notes.c

builtin: pass repository to sub commands

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

pack-objects.c

Merge branch 'ps/build-sign-compare'

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

pack-redundant.c

Merge branch 'ps/build-sign-compare'

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

pack-refs.c

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

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

patch-id.c

builtin/patch-id: fix type of get_one_patchid()

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

prune-packed.c

builtin: remove USE_THE_REPOSITORY for those without the_repository

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

prune.c

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

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

pull.c

global: trivial conversions to fix -Wsign-compare warnings

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

push.c

global: trivial conversions to fix -Wsign-compare warnings

2024-12-06 20:20:04 +09: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

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

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

receive-pack.c

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

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

reflog.c

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

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

refs.c

Merge branch 'kn/pass-repo-to-builtin-sub-sub-commands'

2024-12-04 10:14:47 +09:00

remote-ext.c

builtin: remove USE_THE_REPOSITORY for those without the_repository

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

remote-fd.c

builtin: remove USE_THE_REPOSITORY for those without the_repository

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

remote.c

Merge branch 'ps/build-sign-compare'

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

repack.c

Merge branch 'ps/build-sign-compare'

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

replace.c

refs: allow passing flags when setting up a transaction

2024-11-21 07:59:14 +09:00

replay.c

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

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

rerere.c

global: trivial conversions to fix -Wsign-compare warnings

2024-12-06 20:20:04 +09: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/build-sign-compare'

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

rev-parse.c

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

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

revert.c

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

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

rm.c

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

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

send-pack.c

builtin/send-pack: fix leaking list of push options

2024-09-30 11:23:09 -07: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 'as/show-index-uninitialized-hash'

2024-12-23 09:32:12 -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

global: trivial conversions to fix -Wsign-compare warnings

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

stripspace.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

submodule--helper.c

global: trivial conversions to fix -Wsign-compare warnings

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

symbolic-ref.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

tag.c

Merge branch 'ps/build-sign-compare'

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

unpack-file.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

unpack-objects.c

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

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

update-index.c

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

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

update-ref.c

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

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

update-server-info.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

upload-archive.c

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

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

upload-pack.c

Merge branch 'bc/allow-upload-pack-from-other-people'

2024-12-10 10:04:55 +09:00

var.c

global: trivial conversions to fix -Wsign-compare warnings

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

verify-commit.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

verify-pack.c

builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.h

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

verify-tag.c

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

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

worktree.c

Merge branch 'ps/build-sign-compare'

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

write-tree.c

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

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