author | Junio C Hamano <gitster@pobox.com> | |
Fri, 4 Sep 2009 05:30:27 +0000 (22:30 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 4 Sep 2009 18:50:26 +0000 (11:50 -0700) | ||
commit | 5b5061efd88e1d113a4484369dfab654b43364de | |
tree | 3acca65370698604617c2d771c6512d16820d84e | tree | snapshot |
parent | b8d9c1a66b99ad3ca8069add010dafdd1bc6cab8 | commit | diff |
diff --whitespace=warn/error: obey blank-at-eof
The "diff --check" code used to conflate trailing-space whitespace error
class with this, but now we have a proper separate error class, we should
check it under blank-at-eof, not trailing-space.
The whitespace error is not about _having_ blank lines at end, but about
adding _new_ blank lines. To keep the message consistent with what is
given by "git apply", call whitespace_error_string() to generate it,
instead of using a hardcoded custom message.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The "diff --check" code used to conflate trailing-space whitespace error
class with this, but now we have a proper separate error class, we should
check it under blank-at-eof, not trailing-space.
The whitespace error is not about _having_ blank lines at end, but about
adding _new_ blank lines. To keep the message consistent with what is
given by "git apply", call whitespace_error_string() to generate it,
instead of using a hardcoded custom message.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c | diff | blob | history | |
t/t4015-diff-whitespace.sh | diff | blob | history | |
t/t4019-diff-wserror.sh | diff | blob | history |