summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-26 20:24:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-26 20:24:40 (GMT)
commitc6fabfafbcebca13cee0047b337b7c7a87e3515e (patch)
tree914fe916efcdc8bfa2a0b2413df4b5a76f8f89a6
parent2db511fdbdbe1c8aab80f4bc13f0df037bce8a33 (diff)
downloadgit-c6fabfafbcebca13cee0047b337b7c7a87e3515e.zip
git-c6fabfafbcebca13cee0047b337b7c7a87e3515e.tar.gz
git-c6fabfafbcebca13cee0047b337b7c7a87e3515e.tar.bz2
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>
-rw-r--r--ws.c2
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--;