diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 45058cc8c..37023e30e 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 8acbc660d..523a78a65 100644 --- a/utf8.c +++ b/utf8.c @@ -353,7 +353,7 @@ int strbuf_add_wrapped_text(struct strbuf *buf, c = *text; if (!c || isspace(c)) { - if (w < width || !space) { + if (w <= width || !space) { const char *start = bol; if (!c && text == start) return w;