]> git.ipfire.org Git - thirdparty/git.git/commit
builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM
authorElijah Newren <newren@gmail.com>
Tue, 8 Apr 2025 15:48:42 +0000 (15:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Apr 2025 20:59:14 +0000 (13:59 -0700)
commit170e30d6957e1f7b8d88046ae122f98d57dca988
treecf0f5ca970783870cbde395b4a99a551dd6bf052
parentbfbd201e39b86028440fc95c47173d8da38e1cd2
builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM

This environment variable existed to allow the testsuite to reuse all
the merge-related tests in the testsuite while easily flipping between
the 'recursive' and the 'ort' backends.  Now that we have removed
merge-recursive and remapped 'recursive' to mean 'ort', we don't need
this scaffolding anymore.  Remove it from these three builtins.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c
builtin/rebase.c
builtin/revert.c