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

diff --check: do not discard error status upon seeing a good line

Browse Source 
"git diff --check" should return non-zero when there was any whitespace
error but the code only paid attention to the error status of the last
new line in the patch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-06-26 13:16:33 -07:00
parent e636106c76
commit 18374e584c
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
diff.c
View File

@ -1150,12 +1150,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);

8
t/t4017-diff-retval.sh
View File

@ -105,4 +105,12 @@ test_expect_success '--check with --no-pager returns 2 for dirty difference' '
'
test_expect_success 'check should test not just the last line' '
echo "" >>a &&
git --no-pager diff --check
test $? = 2
'
test_done