From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Nov 2018 13:37:27 +0000 (+0900)
Subject: Merge branch 'jk/xdiff-interface'
X-Git-Tag: v2.20.0-rc0~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/39d23dfa409e51844ddda99599927092c8300f12

Merge branch 'jk/xdiff-interface'

The interface into "xdiff" library used to discover the offset and
size of a generated patch hunk by first formatting it into the
textual hunk header "@@ -n,m +k,l @@" and then parsing the numbers
out.  A new interface has been introduced to allow callers a more
direct access to them.

* jk/xdiff-interface:
xdiff-interface: drop parse_hunk_header()
range-diff: use a hunk callback
diff: convert --check to use a hunk callback
combine-diff: use an xdiff hunk callback
diff: use hunk callback for word-diff
diff: discard hunk headers for patch-ids earlier
diff: avoid generating unused hunk header lines
xdiff-interface: provide a separate consume callback for hunks
xdiff: provide a separate emit callback for hunks
---

39d23dfa409e51844ddda99599927092c8300f12