mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
Merge branch 'maint'
* maint: diff --check: fix off by one error spurious .sp in manpages
This commit is contained in:
commit
27e4dd8de7
4
diff.c
4
diff.c
|
@ -860,8 +860,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] == ' ')
|
||||
|
@ -876,6 +874,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] == '@') {
|
||||
|
|
Loading…
Reference in a new issue