On 3/9/2021 1:24 AM, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren <newren@xxxxxxxxx> > > ll_merge() needs an index when renormalization is requested. Create one > specifically for just this purpose with just the one needed entry. This > fixes t6418.4 and t6418.5 under GIT_TEST_MERGE_ALGORITHM=ort. I have similar concerns here. This strategy of creating an index with only one entry is adding some deep coupling between the ORT code and these normalization methods. It would be a better pattern to extract the logic that normalizes based on some attributes file without caring where it came from. Thanks, -Stolee