git/xdiff, branch seen

Merge branch 'mm/diff-U-takes-no-negative-values' into jch

2026-05-17T13:58:45Z

The command line parser for "git diff" learned a few options take only non-negative integers. * mm/diff-U-takes-no-negative-values: parse-options: clarify what "negated" means for PARSE_OPT_NONEG xdiff: guard against negative context lengths diff: reject negative values for -U/--unified diff: reject negative values for --inter-hunk-context

Merge branch 'pw/xdiff-shrink-memory-consumption' into jch

2026-05-17T13:58:44Z

Shrink wasted memory in Myers diff that does not account for common prefix and suffix removal. * pw/xdiff-shrink-memory-consumption: xdiff: reduce the size of array xprepare: simplify error handling xdiff: cleanup xdl_clean_mmatch() xdiff: reduce size of action arrays

Merge branch 'en/xdiff-cleanup-3' into jch

2026-05-17T13:58:38Z

Preparation of the xdiff/ codebase to work with Rust. * en/xdiff-cleanup-3: xdiff/xdl_cleanup_records: make execution of action easier to follow 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: guard against negative context lengths

2026-05-13T01:13:26Z

The xdemitconf_t fields ctxlen and interhunkctxlen are typed as long (signed), but negative values are not meaningful for context line counts. Unlike the diff_options fields changed in the previous two commits, these cannot be converted to unsigned because the xdiff arithmetic relies on signed subtraction: s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0); If ctxlen were unsigned long, the signed operand would be implicitly converted to unsigned, and the subtraction would wrap to a large positive value when i1 < ctxlen, defeating the XDL_MAX clamp. The signed type is required for correct context-window calculations. The previous two commits reject negative values at the parse layer for --inter-hunk-context and -U/--unified, so negative values should no longer reach xdiff in normal use. Add BUG() guards at the top of xdl_get_hunk() as defense in depth to catch programming errors in current or future callers that bypass option parsing. xdl_get_hunk() is called by both xdl_emit_diff() and xdl_call_hunk_func(), so a single guard covers all xdiff consumers. Signed-off-by: Michael Montalbo Signed-off-by: Junio C Hamano

xdiff: reduce the size of array

2026-05-05T07:20:06Z

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-05-05T07:20:05Z

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-05-05T07:20:05Z

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-05-05T07:20:05Z

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-05-05T07:19:59Z

* en/xdiff-cleanup-3: xdiff/xdl_cleanup_records: make execution of action easier to follow 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: make execution of action easier to follow

2026-04-30T00:16:51Z

Helped-by: Phillip Wood Signed-off-by: Ezekiel Newren Signed-off-by: Junio C Hamano