undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  diff --check: fix off by one error
  spurious .sp in manpages
This commit is contained in:
Junio C Hamano 2006-12-21 22:56:04 -08:00
commit 27e4dd8de7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@ -860,8 +860,6 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
if (line[0] == '+') { if (line[0] == '+') {
int i, spaces = 0; int i, spaces = 0;
data->lineno++;
/* check space before tab */ /* check space before tab */
for (i = 1; i < len && (line[i] == ' ' || line[i] == '\t'); i++) for (i = 1; i < len && (line[i] == ' ' || line[i] == '\t'); i++)
if (line[i] == ' ') if (line[i] == ' ')
@ -876,6 +874,8 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
if (isspace(line[len - 1])) if (isspace(line[len - 1]))
printf("%s:%d: white space at end: %.*s\n", printf("%s:%d: white space at end: %.*s\n",
data->filename, data->lineno, (int)len, line); data->filename, data->lineno, (int)len, line);
data->lineno++;
} else if (line[0] == ' ') } else if (line[0] == ' ')
data->lineno++; data->lineno++;
else if (line[0] == '@') { else if (line[0] == '@') {