@matheusbsbs / matheus-bagliano / commits / c6fabfafbc
Fork 0

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>

Junio C Hamano committed Feb 26, 2008 at 12:24 UTC c6fabfafbcebca13cee0047b337b7c7a87e3515e
1 file changed +1 -1
ws.c
+1 -1
@@ -234,7 +234,7 @@ int ws_fix_copy(char *dst, const char *src, int len, unsigned ws_rule, int *erro
234 * Strip trailing whitespace
235 */
236 if ((ws_rule & WS_TRAILING_SPACE) &&
237 - (2 < len && isspace(src[len-2]))) {
237 + (2 <= len && isspace(src[len-2]))) {
238 if (src[len - 1] == '\n') {
239 add_nl_to_tail = 1;
240 len--;