Elijah Newren 14c4586c2d merge,rebase,revert: select ort or recursive by config or environment ... Allow the testsuite to run where it treats requests for "recursive" or the default merge algorithm via consulting the environment variable GIT_TEST_MERGE_ALGORITHM which is expected to either be "recursive" (the old traditional algorithm) or "ort" (the new algorithm). Also, allow folks to pick the new algorithm via config setting. It turns out builtin/merge.c already had a way to allow users to specify a different default merge algorithm: pull.twohead. Rather odd configuration name (especially to be in the 'pull' namespace rather than 'merge') but it's there. Add that same configuration to rebase, cherry-pick, and revert. This required updating the various callsites that called merge_trees() or merge_recursive() to conditionally call the new API, so this serves as another demonstration of what the new API looks and feels like. There are almost certainly some callsites that have not yet been modified to work with the new merge algorithm, but this represents the ones that I have been testing with thus far. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2020-11-02 16:35:50 -08:00
..
add.c	drop unused argc parameters	2020-09-30 12:53:47 -07:00
am.c	assert PARSE_OPT_NONEG in parse-options callbacks	2020-09-30 12:53:47 -07:00
annotate.c	strvec: rename struct fields	2020-07-30 19:18:06 -07:00
apply.c	apply.c: make init_apply_state() take a struct repository	2018-08-13 14:14:44 -07:00
archive.c	pack-protocol.txt: accept error packets in any context	2019-01-02 13:05:30 -08:00
bisect--helper.c	Merge branch 'mr/bisect-in-c-2'	2020-10-04 12:49:08 -07:00
blame.c	Merge branch 'jc/blame-ignore-fix'	2020-10-04 12:49:07 -07:00
branch.c	ref-filter: allow merged and no-merged filters	2020-09-16 12:38:10 -07:00
bugreport.c	Merge branch 'jk/slimmed-down'	2020-09-03 12:37:02 -07:00
bundle.c	Merge branch 'bc/sha-256-part-3'	2020-08-11 18:04:11 -07:00
cat-file.c	Merge branch 'cc/cat-file-usage-update' into master	2020-07-09 14:00:41 -07:00
check-attr.c	cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch	2019-01-24 11:55:06 -08:00
check-ignore.c	dir: fix problematic API to avoid memory leaks	2020-08-18 17:17:31 -07:00
check-mailmap.c
check-ref-format.c
checkout-index.c	Use OPT_CALLBACK and OPT_CALLBACK_F	2020-04-28 10:47:10 -07:00
checkout.c	Merge branch 'jt/interpret-branch-name-fallback'	2020-09-09 13:53:09 -07:00
clean.c	quote_path: give flags parameter to quote_path()	2020-09-10 10:49:19 -07:00
clone.c	builtin/clone: avoid failure with GIT_DEFAULT_HASH	2020-09-22 09:22:32 -07:00
column.c	builtin: consistently pass cmd_* prefix to parse_options	2019-05-13 14:22:53 +09:00
commit-graph.c	assert PARSE_OPT_NONEG in parse-options callbacks	2020-09-30 12:53:47 -07:00
commit-tree.c	Use OPT_CALLBACK and OPT_CALLBACK_F	2020-04-28 10:47:10 -07:00
commit.c	drop unused argc parameters	2020-09-30 12:53:47 -07:00
config.c	Merge branch 'ls/mergetool-meld-auto-merge'	2020-09-22 12:36:29 -07:00
count-objects.c	rename "alternate_object_database" to "object_directory"	2018-11-13 14:22:02 +09:00
credential-cache--daemon.c	make credential helpers builtins	2020-08-13 11:02:08 -07:00
credential-cache.c	Merge branch 'jc/undash-in-tree-git-callers'	2020-09-03 12:37:03 -07:00
credential-store.c	make credential helpers builtins	2020-08-13 11:02:08 -07:00
credential.c
describe.c	strvec: rename struct fields	2020-07-30 19:18:06 -07:00
diff-files.c	diff-files: treat "i-t-a" files as "not-in-index"	2020-06-22 10:46:45 -07:00
diff-index.c	cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch	2019-01-24 11:55:06 -08:00
diff-tree.c	diff-tree.c: load notes machinery when required	2020-04-20 18:22:54 -07:00
diff.c	diff: get rid of redundant 'dense' argument	2020-09-29 11:54:53 -07:00
difftool.c	strvec: rename struct fields	2020-07-30 19:18:06 -07:00
env--helper.c	assert PARSE_OPT_NONEG in parse-options callbacks	2020-09-30 12:53:47 -07:00
fast-export.c	Merge branch 'js/default-branch-name-part-2'	2020-10-05 14:01:50 -07:00
fast-import.c	fast-import: use write_pack_header()	2020-09-06 13:40:37 -07:00
fetch-pack.c	fetch-pack: remove no_dependents code	2020-08-18 16:46:53 -07:00
fetch.c	Merge branch 'jk/refspecs-negative'	2020-10-05 14:01:54 -07:00
fmt-merge-msg.c	Lib-ify fmt-merge-msg	2020-03-24 15:04:43 -07:00
for-each-ref.c	ref-filter: allow merged and no-merged filters	2020-09-16 12:38:10 -07:00
fsck.c	fsck: do not lazy fetch known non-promisor object	2020-08-06 13:01:03 -07:00
gc.c	maintenance: add trace2 regions for task execution	2020-09-17 11:30:05 -07:00
get-tar-commit-id.c	builtin/get-tar-commit-id: make hash size independent	2019-04-01 11:57:39 +09:00
grep.c	quote_path: give flags parameter to quote_path()	2020-09-10 10:49:19 -07:00
hash-object.c	builtin: consistently pass cmd_* prefix to parse_options	2019-05-13 14:22:53 +09:00
help.c	help: drop usage of 'common' and 'useful' for guides	2020-08-04 18:34:01 -07:00
index-pack.c	Merge branch 'jk/index-pack-hotfixes'	2020-10-08 21:53:26 -07:00
init-db.c	builtin/clone: avoid failure with GIT_DEFAULT_HASH	2020-09-22 09:22:32 -07:00
interpret-trailers.c	Use OPT_CALLBACK and OPT_CALLBACK_F	2020-04-28 10:47:10 -07:00
log.c	Merge branch 'jk/format-auto-base-when-able'	2020-10-05 14:01:55 -07:00
ls-files.c	dir: fix problematic API to avoid memory leaks	2020-08-18 17:17:31 -07:00
ls-remote.c	Merge branch 'jk/unleak-fixes'	2020-08-24 14:54:30 -07:00
ls-tree.c	Merge branch 'nd/attr-pathspec-in-tree-walk'	2019-01-14 15:29:28 -08:00
mailinfo.c
mailsplit.c
merge-base.c	rebase: --fork-point regression fix	2020-02-11 09:59:39 -08:00
merge-file.c	assert NOARG/NONEG behavior of parse-options callbacks	2018-11-06 12:56:29 +09:00
merge-index.c	cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch	2019-01-24 11:55:06 -08:00
merge-ours.c	cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch	2019-01-24 11:55:06 -08:00
merge-recursive.c	Ensure index matches head before invoking merge machinery, round N	2019-08-19 10:08:03 -07:00
merge-tree.c	Merge branch 'jk/tree-walk-overflow'	2019-08-22 12:34:10 -07:00
merge.c	merge,rebase,revert: select ort or recursive by config or environment	2020-11-02 16:35:50 -08:00
mktag.c	sha1-file: allow check_object_signature() to handle any repo	2020-01-31 10:45:39 -08:00
mktree.c	mktree: drop unused length parameter	2019-05-13 14:22:54 +09:00
multi-pack-index.c	multi-pack-index: add [--[no-]progress] option.	2019-10-23 12:05:06 +09:00
mv.c	git-mv: improve error message for conflicted file	2020-07-20 14:35:43 -07:00
name-rev.c	messages: avoid SHA-1 in end-user facing messages	2020-08-14 09:33:37 -07:00
notes.c	Use OPT_CALLBACK and OPT_CALLBACK_F	2020-04-28 10:47:10 -07:00
pack-objects.c	Merge branch 'jc/object-names-are-not-sha-1'	2020-08-19 16:14:52 -07:00
pack-redundant.c	object-store: rename and expand packed_git's sha1 member	2019-04-01 11:57:38 +09:00
pack-refs.c	Honor core.precomposeUnicode in more places	2019-04-26 10:54:03 +09:00
patch-id.c	patch-id: use oid_to_hex() to print multiple object IDs	2019-12-09 12:26:40 -08:00
prune-packed.c	Lib-ify prune-packed	2020-03-24 15:04:44 -07:00
prune.c	Merge branch 'tb/shallow-cleanup'	2020-05-13 12:19:18 -07:00
pull.c	Merge branch 'ah/pull'	2020-09-29 14:01:22 -07:00
push.c	push: drop unused repo argument to do_push()	2020-09-30 12:53:47 -07:00
range-diff.c	strvec: convert builtin/ callers away from argv_array name	2020-07-28 15:02:18 -07:00
read-tree.c	Use OPT_CALLBACK and OPT_CALLBACK_F	2020-04-28 10:47:10 -07:00
rebase.c	merge,rebase,revert: select ort or recursive by config or environment	2020-11-02 16:35:50 -08:00
receive-pack.c	Merge branch 'jx/proc-receive-hook'	2020-09-25 15:25:39 -07:00
reflog.c	Merge branch 'es/get-worktrees-unsort'	2020-07-06 22:09:15 -07:00
remote-ext.c	strvec: convert builtin/ callers away from argv_array name	2020-07-28 15:02:18 -07:00
remote-fd.c
remote.c	Merge branch 'cs/don-t-pretend-a-failed-remote-set-head-succeeded'	2020-09-22 12:36:32 -07:00
repack.c	Merge branch 'tb/repack-clearing-midx'	2020-09-09 13:53:06 -07:00
replace.c	strvec: rename struct fields	2020-07-30 19:18:06 -07:00
rerere.c	Merge branch 'nd/the-index' into md/list-objects-filter-by-depth	2019-01-15 15:38:29 -08:00
reset.c	wt-status: tolerate dangling marks	2020-09-02 14:39:25 -07:00
rev-list.c	bisect: combine args passed to find_bisection()	2020-08-07 15:13:03 -07:00
rev-parse.c	wt-status: tolerate dangling marks	2020-09-02 14:39:25 -07:00
revert.c	merge,rebase,revert: select ort or recursive by config or environment	2020-11-02 16:35:50 -08:00
rm.c	rm: support the --pathspec-from-file option	2020-02-19 10:56:49 -08:00
send-pack.c	Merge branch 'jx/proc-receive-hook'	2020-09-25 15:25:39 -07:00
shortlog.c	shortlog: allow multiple groups to be specified	2020-09-27 12:21:05 -07:00
show-branch.c	Merge branch 'jt/interpret-branch-name-fallback'	2020-09-09 13:53:09 -07:00
show-index.c	builtin/show-index: provide options to determine hash algo	2020-05-27 10:07:07 -07:00
show-ref.c	Use OPT_CALLBACK and OPT_CALLBACK_F	2020-04-28 10:47:10 -07:00
sparse-checkout.c	sparse-checkout: fill in some options boilerplate	2020-09-30 12:53:48 -07:00
stash.c	Merge branch 'jt/interpret-branch-name-fallback'	2020-09-09 13:53:09 -07:00
stripspace.c	stripspace: allow -s/-c outside git repository	2018-12-26 15:41:47 -08:00
submodule--helper.c	doc: fix the bnf like style of some commands	2020-10-08 14:01:19 -07:00
symbolic-ref.c
tag.c	ref-filter: allow merged and no-merged filters	2020-09-16 12:38:10 -07:00
unpack-file.c	object-store: move object access functions to object-store.h	2018-05-16 11:42:03 +09:00
unpack-objects.c	sha1-file: pass git_hash_algo to hash_object_file()	2020-01-31 10:45:39 -08:00
update-index.c	Use OPT_CALLBACK and OPT_CALLBACK_F	2020-04-28 10:47:10 -07:00
update-ref.c	strvec: rename files from argv-array to strvec	2020-07-28 15:02:17 -07:00
update-server-info.c
upload-archive.c	strvec: rename struct fields	2020-07-30 19:18:06 -07:00
upload-pack.c	builtin: consistently pass cmd_* prefix to parse_options	2019-05-13 14:22:53 +09:00
var.c
verify-commit.c	Merge branch 'jk/no-system-includes-in-dot-c'	2019-07-31 14:38:56 -07:00
verify-pack.c	Merge branch 'bc/sha-256-part-3'	2020-08-11 18:04:11 -07:00
verify-tag.c	verify-tag: drop signal.h include	2019-06-19 08:19:21 -07:00
worktree.c	Merge branch 'es/wt-add-detach'	2020-09-18 17:58:04 -07:00
write-tree.c	cmd_{read,write}_tree: rename "unused" variable that is used	2019-05-13 14:22:53 +09:00