DORMANTno replies

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:18
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---
 ws.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help