]> git.ipfire.org Git - thirdparty/git.git/commit - xdiff-interface.c
xdiff-interface: provide a separate consume callback for hunks
authorJeff King <peff@peff.net>
Fri, 2 Nov 2018 06:35:45 +0000 (02:35 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 11:43:02 +0000 (20:43 +0900)
commit9346d6d14dddc7989ba879839d58f6c2426cffbb
tree6255724677334f2267490a6a171f7073b17ea997
parent611e42a5980a3a9f8bb3b1b49c1abde63c7a191e
xdiff-interface: provide a separate consume callback for hunks

The previous commit taught xdiff to optionally provide the hunk header
data to a specialized callback. But most users of xdiff actually use our
more convenient xdi_diff_outf() helper, which ensures that our callbacks
are always fed whole lines.

Let's plumb the special hunk-callback through this interface, too. It
will follow the same rule as xdiff when the hunk callback is NULL (i.e.,
continue to pass a stringified hunk header to the line callback). Since
we add NULL to each caller, there should be no behavior change yet.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
combine-diff.c
diff.c
diffcore-pickaxe.c
range-diff.c
xdiff-interface.c
xdiff-interface.h