* [PATCH] git-apply --whitespace=fix: fix off by one thinko
@ 2008-02-27 19:48 Junio C Hamano
0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2008-02-27 19:48 UTC (permalink / raw)
To: git
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(-)
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-02-27 19:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-27 19:48 [PATCH] git-apply --whitespace=fix: fix off by one thinko Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).