From 86f8c2368523db5ee56c8856748b26c31ebeb0aa Mon Sep 17 00:00:00 2001 From: Wincent Colaiuta Date: Wed, 12 Dec 2007 17:22:59 +0100 Subject: Fix "diff --check" whitespace detection "diff --check" would only detect spaces before tabs if a tab was the last character in the leading indent. Fix that and add a test case to make sure the bug doesn't regress in the future. Signed-off-by: Wincent Colaiuta Signed-off-by: Junio C Hamano --- diff.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index d97ebc501..9c79ee289 100644 --- a/diff.c +++ b/diff.c @@ -1044,11 +1044,18 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len) int i, spaces = 0, space_before_tab = 0, white_space_at_end = 0; /* check space before tab */ - for (i = 1; i < len && (line[i] == ' ' || line[i] == '\t'); i++) + for (i = 1; i < len; i++) { if (line[i] == ' ') spaces++; - if (line[i - 1] == '\t' && spaces) - space_before_tab = 1; + else if (line[i] == '\t') { + if (spaces) { + space_before_tab = 1; + break; + } + } + else + break; + } /* check whitespace at line end */ if (line[len - 1] == '\n') -- cgit v1.2.1