[PATCH] git-apply --whitespace=fix: fix off by one thinko

Junio C Hamano· Feb 27, 2008, 19:48 UTC · lore

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>
---
 ws.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to ws.c +1 −1

diff --git a/ws.c b/ws.c
index 522f646..ba7e834 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--;

-- 
1.5.4.3.339.gad2d1

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