From: Phillip Wood <[email protected]> This will be used by the move detection code.
Signed-off-by: Phillip Wood <[email protected]> --- xdiff-interface.c | 5 +++++ xdiff-interface.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/xdiff-interface.c b/xdiff-interface.c index 9315bc0ede..eceabfa72d 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -308,6 +308,11 @@ int xdiff_compare_lines(const char *l1, long s1, return xdl_recmatch(l1, s1, l2, s2, flags); } +int xdiff_is_blankline(const char *l1, long s1, long flags) +{ + return xdl_blankline(l1, s1, flags); +} + int git_xmerge_style = -1; int git_xmerge_config(const char *var, const char *value, void *cb) diff --git a/xdiff-interface.h b/xdiff-interface.h index 135fc05d72..d0008b016f 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -45,4 +45,9 @@ extern int xdiff_compare_lines(const char *l1, long s1, */ extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags); +/* + * Returns 1 if the line is blank, taking XDF_WHITESPACE_FLAGS into account + */ +extern int xdiff_is_blankline(const char *s, long len, long flags); + #endif -- 2.19.0
