From: Phillip Wood <phillip.wood123@gmail.com>
Date: Wed, 24 Sep 2025 10:22:13 GMT
Subject: Re: [PATCH v5 10/13] xdiff: delete rchg aliasing
Message-ID: <0bb4f30b-6737-43a2-9aeb-3903c0dc5ce6@gmail.com>
In-Reply-To: <7b0856108a29f42e5a4d3faf7489d5522b683f71.1758662670.git.gitgitgadget@gmail.com>

On 23/09/2025 22:24, Ezekiel Newren via GitGitGadget wrote:
> From: Ezekiel Newren <ezekielnewren@gmail.com>

The commit message should explain why this change is being made

Thanks

Phillip

> Best-viewed-with: --color-words
> Signed-off-by: Ezekiel Newren <ezekielnewren@gmail.com>
> ---
>   xdiff/xdiffi.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
> index a66125d44a..83c4cff6f7 100644
> --- a/xdiff/xdiffi.c
> +++ b/xdiff/xdiffi.c
> @@ -932,16 +932,15 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
>   
>   int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr) {
>   	xdchange_t *cscr = NULL, *xch;
> -	char *rchg1 = xe->xdf1.rchg, *rchg2 = xe->xdf2.rchg;
>   	long i1, i2, l1, l2;
>   
>   	/*
>   	 * Trivial. Collects "groups" of changes and creates an edit script.
>   	 */
>   	for (i1 = xe->xdf1.nrec, i2 = xe->xdf2.nrec; i1 >= 0 || i2 >= 0; i1--, i2--)
> -		if (rchg1[i1 - 1] || rchg2[i2 - 1]) {
> -			for (l1 = i1; rchg1[i1 - 1]; i1--);
> -			for (l2 = i2; rchg2[i2 - 1]; i2--);
> +		if (xe->xdf1.rchg[i1 - 1] || xe->xdf2.rchg[i2 - 1]) {
> +			for (l1 = i1; xe->xdf1.rchg[i1 - 1]; i1--);
> +			for (l2 = i2; xe->xdf2.rchg[i2 - 1]; i2--);
>   
>   			if (!(xch = xdl_add_change(cscr, i1, i2, l1 - i1, l2 - i2))) {
>   				xdl_free_script(cscr);