summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2007-12-14 11:23:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-12-15 04:51:58 (GMT)
commit420f4f04de9b3790da695918ac168d4115665d92 (patch)
tree12d42e0da97135bf4f7819baccc3396b94142654 /t
parentf817546652812ad5f20a8ab4a4a7290a9759ac4e (diff)
downloadgit-420f4f04de9b3790da695918ac168d4115665d92.zip
git-420f4f04de9b3790da695918ac168d4115665d92.tar.gz
git-420f4f04de9b3790da695918ac168d4115665d92.tar.bz2
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-xt/t4015-diff-whitespace.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 05ef78b..9bff8f5 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"
'