From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jun 2026 23:14:10 +0000 (+0900)
Subject: Merge branch 'mm/diff-process-hunks' into seen
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=4acde18cb2b43d0cf7f40797f860d3c7db7adc7f;p=thirdparty%2Fgit.git

Merge branch 'mm/diff-process-hunks' into seen

A new `diff.<driver>.process` configuration has been introduced to
allow a long-running external process to act as a hunk provider to
allows external tools to control which lines Git considers changed
while leaving all output formatting (word diff, color, blame, etc.) to
Git's standard pipeline.

* mm/diff-process-hunks:
  blame: consult diff process for no-hunk detection
  diff: bypass diff process with --no-ext-diff and in format-patch
  diff: add long-running diff process via diff.<driver>.process
  sub-process: separate process lifecycle from hashmap management
  userdiff: add diff.<driver>.process config
  xdiff: support external hunks via xpparam_t
---

4acde18cb2b43d0cf7f40797f860d3c7db7adc7f