diff options
| author | Jeff King <peff@peff.net> | 2018-11-02 07:36:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-05 05:14:35 +0100 |
| commit | 3b40a090fd4e441e88897dfa96f50039952ed45b (patch) | |
| tree | 41935127edd97b3508504b0ca8533ef8226c43ed /xdiff-interface.c | |
| parent | xdiff-interface: provide a separate consume callback for hunks (diff) | |
| download | git-3b40a090fd4e441e88897dfa96f50039952ed45b.tar.xz git-3b40a090fd4e441e88897dfa96f50039952ed45b.zip | |
diff: avoid generating unused hunk header lines
Some callers of xdi_diff_outf() do not look at the generated hunk header
lines at all. By plugging in a no-op hunk callback, this tells xdiff not
to even bother formatting them.
This patch introduces a stock no-op callback and uses it with a few
callers whose line callbacks explicitly ignore hunk headers (because
they look only for +/- lines).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index eb9c05a1e3..b99a57825f 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -157,6 +157,12 @@ int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co return xdl_diff(&a, &b, xpp, xecfg, xecb); } +void discard_hunk_line(void *priv, + long ob, long on, long nb, long nn, + const char *func, long funclen) +{ +} + int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, xdiff_emit_hunk_fn hunk_fn, xdiff_emit_line_fn line_fn, |