kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2008-02-26 12:24:40 -08:00
parent 2db511fdbd
commit c6fabfafbc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ws.c
View File

@ -234,7 +234,7 @@ int ws_fix_copy(char *dst, const char *src, int len, unsigned ws_rule, int *erro
* Strip trailing whitespace * Strip trailing whitespace
*/ */
if ((ws_rule & WS_TRAILING_SPACE) && if ((ws_rule & WS_TRAILING_SPACE) &&
(2 < len && isspace(src[len-2]))) { (2 <= len && isspace(src[len-2]))) {
if (src[len - 1] == '\n') { if (src[len - 1] == '\n') {
add_nl_to_tail = 1; add_nl_to_tail = 1;
len--; len--;