On 8/27/2021 6:47 PM, Elijah Newren wrote: > On Tue, Aug 24, 2021 at 2:52 PM Derrick Stolee via GitGitGadget > <gitgitgadget@xxxxxxxxx> wrote: ... >> + ( >> + sane_unset GIT_TEST_MERGE_ALGORITHM && >> + git -C sparse-index config pull.twohead ort && >> + ensure_not_expanded ! merge -m merged expand-right >> + ) > > These last five lines could just be replaced with the fourth, if you > just set GIT_TEST_MERGE_ALGORITHM=ort at the beginning of the file. > > Are you worrying about testing with recursive in some of the testcases? Yes. In fact, since I _stopped_ setting GIT_TEST_MERGE_ALGORITHM at the start of the file since the previous version, I found and fixed a bug which forms the new Patch 5 (sequencer: ensure full index if not ORT strategy). Thanks, -Stolee
