mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  GIT 1.5.5.5
  GIT 1.5.4.6
  git-shell: accept "git foo" form
  diff --check: do not discard error status upon seeing a good line
This commit is contained in:
Junio C Hamano
2008-06-26 18:12:47 -07:00
parent d2bf48d2ad 7ac749c96d
commit c0f5c69c68
5 changed files with 80 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
diff.c
View File

@ -1151,12 +1151,14 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
char *err;
if (line[0] == '+') {
unsigned bad;
data->lineno++;
data->status = check_and_emit_line(line + 1, len - 1,
bad = check_and_emit_line(line + 1, len - 1,
data->ws_rule, NULL, NULL, NULL, NULL);
if (!data->status)
if (!bad)
return;
err = whitespace_error_string(data->status);
data->status |= bad;
err = whitespace_error_string(bad);
fprintf(data->file, "%s:%d: %s.\n", data->filename, data->lineno, err);
free(err);
emit_line(data->file, set, reset, line, 1);