diff options
| author |  Jeff King <peff@peff.net> | 2018-11-02 02:36:06 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-05 13:14:35 +0900 |
| commit | 3b40a090fd4e441e88897dfa96f50039952ed45b (patch) | |
| tree | 41935127edd97b3508504b0ca8533ef8226c43ed /diff.c | |
| parent | xdiff-interface: provide a separate consume callback for hunks (diff) | |
| download | tgif-3b40a090fd4e441e88897dfa96f50039952ed45b.tar.xz | |
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 'diff.c')
| -rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3604,8 +3604,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b, xpp.anchors_nr = o->anchors_nr; xecfg.ctxlen = o->context; xecfg.interhunkctxlen = o->interhunkcontext; - if (xdi_diff_outf(&mf1, &mf2, NULL, diffstat_consume, - diffstat, &xpp, &xecfg)) + if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line, + diffstat_consume, diffstat, &xpp, &xecfg)) die("unable to generate diffstat for %s", one->path); } |