summaryrefslogtreecommitdiff
path: root/utf8.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-20 09:57:44 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-20 09:57:44 -0800
commitfd778c09b1bb683d930dae59566bce79be89c628 (patch)
treebf503a6773cfff44269a8c2cd6744672ca66432c /utf8.c
parent2808f6abc238ab038020681d43eaec7c0335efaa (diff)
parent25dc8dad3a7c9f5426f549701e22eec1f894fec8 (diff)
downloadgit-fd778c09b1bb683d930dae59566bce79be89c628.tar.gz
Merge branch 'js/format-2047' into maint
Various rfc2047 quoting issues around a non-ASCII name on the From: line in the output from format-patch have been corrected. * js/format-2047: format-patch tests: check quoting/encoding in To: and Cc: headers format-patch: fix rfc2047 address encoding with respect to rfc822 specials format-patch: make rfc2047 encoding more strict format-patch: introduce helper function last_line_length() format-patch: do not wrap rfc2047 encoded headers too late format-patch: do not wrap non-rfc2047 headers too early utf8: fix off-by-one wrapping of text
Diffstat (limited to 'utf8.c')
-rw-r--r--utf8.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/utf8.c b/utf8.c
index a544f15456..28791a7c31 100644
--- a/utf8.c
+++ b/utf8.c
@@ -353,7 +353,7 @@ retry:
c = *text;
if (!c || isspace(c)) {
- if (w < width || !space) {
+ if (w <= width || !space) {
const char *start = bol;
if (!c && text == start)
return w;