git.git - The core git plumbing

Age	Commit message (Collapse)	Author	Files	Lines
2025-04-08	tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm	Elijah Newren	1	-13/+0
	Both of these existed to allow us 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. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-10-26	t/: new helper for tests that pass with ort but fail with recursive	Elijah Newren	1	-0/+13
	There are a number of tests that the "recursive" backend does not handle correctly but which the redesign in "ort" will. Add a new helper in lib-merge.sh for selecting a different test expectation based on the setting of GIT_TEST_MERGE_ALGORITHM, and use it in various testcases to document which ones we expect to fail under recursive but pass under ort. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>