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.h | |
| 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.h')
| -rw-r--r-- | xdiff-interface.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index 2dbe2feb19..8af245eed9 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -36,6 +36,14 @@ extern int git_xmerge_config(const char *var, const char *value, void *cb); extern int git_xmerge_style; /* + * Can be used as a no-op hunk_fn for xdi_diff_outf(), since a NULL + * one just sends the hunk line to the line_fn callback). + */ +void discard_hunk_line(void *priv, + long ob, long on, long nb, long nn, + const char *func, long funclen); + +/* * Compare the strings l1 with l2 which are of size s1 and s2 respectively. * Returns 1 if the strings are deemed equal, 0 otherwise. * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces |