git-apply --whitespace=fix: fix off by one thinko

When a patch adds a whitespace followed by end-of-line, the
trailing whitespace error was detected correctly but was not
fixed, due to misconversion in 42ab241 (builtin-apply.c: do not
feed copy_wsfix() leading '+').

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ws.c b/ws.c
index 522f646ed7f492a91ea288d03aabfcf5db69c196..ba7e834ca819b1d2ccce6cf125aa9f34efea8d5c 100644 (file)
--- a/ws.c
+++ b/ws.c
@@ -234,7 +234,7 @@ int ws_fix_copy(char *dst, const char *src, int len, unsigned ws_rule, int *erro
         * Strip trailing whitespace
         */
        if ((ws_rule & WS_TRAILING_SPACE) &&
         * Strip trailing whitespace
         */
        if ((ws_rule & WS_TRAILING_SPACE) &&

-           (2 < len && isspace(src[len-2]))) {
+           (2 <= len && isspace(src[len-2]))) {

                if (src[len - 1] == '\n') {
                        add_nl_to_tail = 1;
                        len--;
                if (src[len - 1] == '\n') {
                        add_nl_to_tail = 1;
                        len--;