From: Jan H. Schönherr Date: Thu, 18 Oct 2012 14:43:28 +0000 (+0200) Subject: utf8: fix off-by-one wrapping of text X-Git-Tag: v1.8.0.1~12^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14e1a4e1ff70aff36db3f5d2a8b806efd0134d50;p=thirdparty%2Fgit.git utf8: fix off-by-one wrapping of text The wrapping logic in strbuf_add_wrapped_text() does currently not allow lines that entirely fill the allowed width, instead it wraps the line one character too early. For example, the text "This is the sixth commit." formatted via "%w(11,1,2)" (wrap at 11 characters, 1 char indent of first line, 2 char indent of following lines) results in four lines: " This is", " the", " sixth", " commit." This is wrong, because " the sixth" is exactly 11 characters long, and thus allowed. Fix this by allowing the (width+1) character of a line to be a valid wrapping point if it is a whitespace character. Signed-off-by: Jan H. Schönherr Signed-off-by: Junio C Hamano --- diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 45058cc8cb..37023e30ea 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -72,9 +72,9 @@ cat > expect << EOF commit. EOF -test_expect_success 'format %w(12,1,2)' ' +test_expect_success 'format %w(11,1,2)' ' - git log -2 --format="%w(12,1,2)This is the %s commit." > actual && + git log -2 --format="%w(11,1,2)This is the %s commit." > actual && test_cmp expect actual ' diff --git a/utf8.c b/utf8.c index 8acbc660d3..523a78a651 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;