From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri, 22 Dec 2006 02:20:11 +0000 (+0100)
Subject: diff --check: fix off by one error
X-Git-Tag: v1.5.0-rc0~43^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e6d40d65df07059fc655fabe62fa5b575ead7815;p=git.git

diff --check: fix off by one error

When parsing the diff line starting with '@@', the line number of the
'+' file is parsed. For the subsequent line parses, the line number
should therefore be incremented after the parse, not before it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff.c b/diff.c
index 33153787b..b003c0001 100644
--- a/diff.c
+++ b/diff.c
@@ -825,8 +825,6 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
 	if (line[0] == '+') {
 		int i, spaces = 0;
 
-		data->lineno++;
-
 		/* check space before tab */
 		for (i = 1; i < len && (line[i] == ' ' || line[i] == '\t'); i++)
 			if (line[i] == ' ')
@@ -841,6 +839,8 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
 		if (isspace(line[len - 1]))
 			printf("%s:%d: white space at end: %.*s\n",
 				data->filename, data->lineno, (int)len, line);
+
+		data->lineno++;
 	} else if (line[0] == ' ')
 		data->lineno++;
 	else if (line[0] == '@') {