diff options
author | Wincent Colaiuta <win@wincent.com> | 2007-12-14 12:23:43 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-12-14 20:51:58 -0800 |
commit | 420f4f04de9b3790da695918ac168d4115665d92 (patch) | |
tree | 12d42e0da97135bf4f7819baccc3396b94142654 /t | |
parent | Add tests for "git diff --check" with core.whitespace options (diff) | |
download | tgif-420f4f04de9b3790da695918ac168d4115665d92.tar.xz |
Use shorter error messages for whitespace problems
The initial version of the whitespace_error_string() function took the
messages from builtin-apply.c rather than the shorter messages from
diff.c.
This commit addresses Junio's concern that these messages might be too
long (now that we can emit multiple warnings per line).
Signed-off-by: Wincent Colaiuta <win@wincent.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-x | t/t4015-diff-whitespace.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 05ef78b2c0..9bff8f5e4b 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -121,7 +121,7 @@ test_expect_success 'check mixed spaces and tabs in indent' ' # This is indented with SP HT SP. echo " foo();" > x && - git diff --check | grep "Space in indent is followed by a tab" + git diff --check | grep "space before tab in indent" ' |