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 /diffcore-pickaxe.c | |
| parent | 9346d6d14dddc7989ba879839d58f6c2426cffbb (diff) | |
| download | git-3b40a090fd4e441e88897dfa96f50039952ed45b.tar.gz git-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 'diffcore-pickaxe.c')
| -rw-r--r-- | diffcore-pickaxe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 7609bb4fe..25e12148e 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -62,7 +62,8 @@ static int diff_grep(mmfile_t *one, mmfile_t *two, ecbdata.hit = 0; xecfg.ctxlen = o->context; xecfg.interhunkctxlen = o->interhunkcontext; - if (xdi_diff_outf(one, two, NULL, diffgrep_consume, &ecbdata, &xpp, &xecfg)) + if (xdi_diff_outf(one, two, discard_hunk_line, diffgrep_consume, + &ecbdata, &xpp, &xecfg)) return 0; return ecbdata.hit; } |