Re: [PATCH v2 03/10] merge-ort: have ll_merge() use a special attr_index for renormalization

From: Derrick Stolee <stolee@gmail.com>
Date: Mar 11, 2021, 14:52 UTC
Message-ID: <a6f65409-29c6-a863-9804-41cba09d5732@gmail.com>
In-Reply-To: <386cb3230b6780817120d83457796ccf6f64c84b.1615271086.git.gitgitgadget@gmail.com>

On 3/9/2021 1:24 AM, Elijah Newren via GitGitGadget wrote:

Show 5 quoted lines

> From: Elijah Newren <newren@gmail.com>
> 
> 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