git/xdiff, branch jch

xdiff: reduce the size of array

2026-04-08T21:11:55Z

When the myers algorithm is selected the input files are pre-processed to remove any common prefix and suffix and any lines that appear in only one file. This requires a map to be created between the lines that are processed by the myers algorithm and the lines in the original file. That map does not include the common lines at the beginning and end of the files but the array is allocated to be the size of the whole file. Move the allocation into xdl_cleanup_records() where the map is populated and we know how big it needs to be. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

xprepare: simplify error handling

2026-04-08T21:11:55Z

If either of the two allocations fail we want to take the same action so use a single if statement. This saves a few lines and makes it easier for the next commit to add a couple more allocations. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

xdiff: cleanup xdl_clean_mmatch()

2026-04-08T21:11:53Z

Remove the "s" parameter as, since the last commit, this function is always called with s == 0. Also change parameter "e" to expect a length, rather than the index of the last line to simplify the caller. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

xdiff: reduce size of action arrays

2026-04-08T21:09:32Z

When the myers algorithm is selected the input files are pre-processed to remove any common prefix and suffix. Then any lines that appear only in one side of the diff are marked as changed and frequently occurring lines are marked as changed if they are adjacent to a changed line. This step requires a couple of temporary arrays. As as the common prefix and suffix have already been removed, the arrays only need to be big enough to hold the lines between them, not the whole file. Reduce the size of the arrays and adjust the loops that use them accordingly while taking care to keep indexing the arrays in xdfile_t with absolute line numbers. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

Merge branch 'en/xdiff-cleanup-3' into pw/xdiff-shrink-memory-consumption

2026-04-08T21:01:42Z

* en/xdiff-cleanup-3: xdiff/xdl_cleanup_records: put braces around the else clause xdiff/xdl_cleanup_records: make setting action easier to follow xdiff/xdl_cleanup_records: make limits more clear xdiff/xdl_cleanup_records: use unambiguous types xdiff: use unambiguous types in xdl_bogo_sqrt() xdiff/xdl_cleanup_records: delete local recs pointer

xdiff/xdl_cleanup_records: put braces around the else clause

2026-04-08T20:57:46Z

Signed-off-by: Ezekiel Newren Signed-off-by: Junio C Hamano

xdiff/xdl_cleanup_records: make setting action easier to follow

2026-04-08T20:57:45Z

Rewrite nested ternaries with a clear if/else ladder for action1/action2 to improve readability while preserving behavior. Signed-off-by: Ezekiel Newren Signed-off-by: Junio C Hamano

xdiff/xdl_cleanup_records: make limits more clear

2026-04-08T20:57:45Z

Make the handling of per-file limits and the minimal-case clearer. * Use explicit per-file limit variables (mlim1, mlim2) and initialize them. * The additional condition `!need_min` is redudant now, remove it. Best viewed with --color-words. Signed-off-by: Ezekiel Newren Signed-off-by: Junio C Hamano

xdiff/xdl_cleanup_records: use unambiguous types

2026-04-08T20:57:45Z

Change the parameters of xdl_clean_mmatch() and the local variables i, nm, mlim in xdl_cleanup_records() to use unambiguous types. Best viewed with --color-words. Signed-off-by: Ezekiel Newren Signed-off-by: Junio C Hamano

xdiff: use unambiguous types in xdl_bogo_sqrt()

2026-04-08T20:57:45Z

There is no real square root for a negative number and size_t may not be large enough for certain applications, replace long with uint64_t. Signed-off-by: Ezekiel Newren Signed-off-by: Junio C Hamano