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>
This commit is contained in:

committed by
Junio C Hamano

parent
9346d6d14d
commit
3b40a090fd
@ -35,6 +35,14 @@ extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
|
||||
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.
|
||||
|
Reference in New Issue
Block a user