diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-21 22:56:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-21 22:56:04 -0800 |
| commit | 27e4dd8de76bdd60c88003e0f27cee8ad26c5cd6 (patch) | |
| tree | 3fa180f4495853016b854cc524c425cbbc905845 | |
| parent | git-reset --hard: tell the user what the HEAD was reset to (diff) | |
| parent | diff --check: fix off by one error (diff) | |
| download | tgif-27e4dd8de76bdd60c88003e0f27cee8ad26c5cd6.tar.xz | |
Merge branch 'maint'
* maint:
diff --check: fix off by one error
spurious .sp in manpages
| -rw-r--r-- | diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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] == '@') { |