undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utf8: fix off-by-one wrapping of text

Browse Source 
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 <schnhrr@cs.tu-berlin.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jan H. Schönherr 2012-10-18 16:43:28 +02:00 committed by Junio C Hamano
parent bafc478f16
commit 14e1a4e1ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t4202-log.sh
View File

@ -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
'

2
utf8.c
View File

@ -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;