One more comment... On Fri, Oct 23, 2020 at 10:25 AM Elijah Newren <newren@xxxxxxxxx> wrote: > > On Fri, Oct 23, 2020 at 9:48 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > > > "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > > And the users are just too pleasant to see, with full of "failure > > sucess", which is the second best outcome we want to see ;-) > > > > > +test_expect_merge_algorithm failure success 'check symlink mo... > > > +test_expect_merge_algorithm failure success 'check symlink ad... > > > +test_expect_merge_algorithm failure success 'check submodule ... > > > +test_expect_merge_algorithm failure success 'check submodule ... > > > +test_expect_merge_algorithm failure success 'check conflictin... > > > +test_expect_merge_algorithm failure success 'rad-check: renam... > > > +test_expect_merge_algorithm failure success 'rrdd-check: rena... > > > +test_expect_merge_algorithm failure success 'mod6-check: chai... > > > +test_expect_merge_algorithm failure success '6b1: Same rename... > > > +test_expect_merge_algorithm failure success '6b2: Same rename... > > > +test_expect_merge_algorithm failure success '10e: Does git co... > > > +test_expect_merge_algorithm failure success '12b1: Moving two... > > > +test_expect_merge_algorithm failure success '12c1: Moving one... > > > +test_expect_merge_algorithm failure success '12f: Trivial dir... > > > +test_expect_merge_algorithm failure success '4a: Change on A,... > > > +test_expect_merge_algorithm failure success 'merge-recursive ... > > :-) Actually, there are another 12 submodule-related tests that pass under ort but not under recursive, spread across t3512, t3513, t5572, t6437, and t6438. I didn't (yet) apply the same change there, so they all show up as "TODO passed" if you check out the 'ort' branch of my repo and run the tests with GIT_TEST_MERGE_ALGORITHM=ort. I delayed marking them as expecting success under ort because I suspect that nearby tests should also pass but are just coded too stringently. (For example, perhaps they expected a directory/submodule conflict to result in all files within the conflicting directory to be renamed out of the way instead of expecting the submodule to be moved aside -- moving the submodule aside results in massively less rename handling pressure and is an easier way to make sure that the files under the conflicting directory aren't written into and over entries within the submodule.) I was hoping to get a submodule expert to look over those tests and provide some opinions...
