Merge branch 'jk/xdiff-interface'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 13:37:27 +0000 (22:37 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 13:37:27 +0000 (22:37 +0900)
commit39d23dfa409e51844ddda99599927092c8300f12
treef4975a66a1fb9c33a875fe72042e9b7c75519597
parentf22838aa7a6dcf308a3307ba17f8afa40989ad3a
parent5eade0746e1daf659a9559d804068f9f31614625
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
builtin/merge-tree.c
builtin/rerere.c
combine-diff.c
diff.c
diffcore-pickaxe.c
range-diff.c
xdiff-interface.c