git.ipfire.org Git - thirdparty/git.git/commit

]> git.ipfire.org Git - thirdparty/git.git/commit

projects / thirdparty / git.git / commit

author	Elijah Newren <newren@gmail.com>
	Tue, 8 Apr 2025 15:48:41 +0000 (15:48 +0000)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 8 Apr 2025 20:59:13 +0000 (13:59 -0700)
commit	bfbd201e39b86028440fc95c47173d8da38e1cd2
tree	c656921e7bcc70882ee322122c6f738ce6e6e0f2	tree \| snapshot
parent	ad45b327c0a13718ed5955319d1e735025676cc8	commit \| diff

tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm

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>

29 files changed:

ci/run-build-and-tests.sh		diff \| blob \| blame \| history
t/lib-merge.sh	[deleted file]	blob \| blame \| history
t/t1092-sparse-checkout-compatibility.sh		diff \| blob \| blame \| history
t/t2501-cwd-empty.sh		diff \| blob \| blame \| history
t/t3512-cherry-pick-submodule.sh		diff \| blob \| blame \| history
t/t3513-revert-submodule.sh		diff \| blob \| blame \| history
t/t4069-remerge-diff.sh		diff \| blob \| blame \| history
t/t4301-merge-tree-write-tree.sh		diff \| blob \| blame \| history
t/t5572-pull-submodule.sh		diff \| blob \| blame \| history
t/t6400-merge-df.sh		diff \| blob \| blame \| history
t/t6402-merge-rename.sh		diff \| blob \| blame \| history
t/t6404-recursive-merge.sh		diff \| blob \| blame \| history
t/t6406-merge-attr.sh		diff \| blob \| blame \| history
t/t6416-recursive-corner-cases.sh		diff \| blob \| blame \| history
t/t6421-merge-partial-clone.sh		diff \| blob \| blame \| history
t/t6422-merge-rename-corner-cases.sh		diff \| blob \| blame \| history
t/t6423-merge-rename-directories.sh		diff \| blob \| blame \| history
t/t6424-merge-unrelated-index-changes.sh		diff \| blob \| blame \| history
t/t6426-merge-skip-unneeded-updates.sh		diff \| blob \| blame \| history
t/t6428-merge-conflicts-sparse.sh		diff \| blob \| blame \| history
t/t6430-merge-recursive.sh		diff \| blob \| blame \| history
t/t6436-merge-overwrite.sh		diff \| blob \| blame \| history
t/t6437-submodule-merge.sh		diff \| blob \| blame \| history
t/t6438-submodule-directory-file-conflicts.sh		diff \| blob \| blame \| history
t/t6439-merge-co-error-msgs.sh		diff \| blob \| blame \| history
t/t7402-submodule-rebase.sh		diff \| blob \| blame \| history
t/t7602-merge-octopus-many.sh		diff \| blob \| blame \| history
t/t7610-mergetool.sh		diff \| blob \| blame \| history
t/test-lib.sh		diff \| blob \| blame \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom