On 8/30/2021 1:18 PM, Derrick Stolee wrote: > On 8/27/2021 6:43 PM, Elijah Newren wrote: >> On Tue, Aug 24, 2021 at 2:52 PM Derrick Stolee via GitGitGadget >>> + ensure_not_expanded checkout -f update-deep && >>> + ( >>> + sane_unset GIT_TEST_MERGE_ALGORITHM && >>> + git -C sparse-index config pull.twohead ort && >>> + ensure_not_expanded merge -m merge update-folder1 && >>> + ensure_not_expanded merge -m merge update-folder2 >>> + ) >>> ' >> >> Should you use test_config rather than git config here? > > That's a better pattern. It's not technically _required_ for these > tests because the repositories are completely rewritten at the start > of each new test, but it's best to be a good example. Actually, test_config runs test_when_finished, and that results in the following message and failure on macOS and Windows: BUG 'test_when_finished does nothing in a subshell' So, I'll leave this as-is. Thanks, -Stolee
