From c6fabfafbcebca13cee0047b337b7c7a87e3515e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 26 Feb 2008 12:24:40 -0800 Subject: [PATCH] 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 --- ws.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ws.c b/ws.c index 522f646ed7..ba7e834ca8 100644 --- 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) && - (2 < len && isspace(src[len-2]))) { + (2 <= len && isspace(src[len-2]))) { if (src[len - 1] == '\n') { add_nl_to_tail = 1; len--; -- 2.11.4.GIT