Merge branch 'jk/checkout-out-of-unborn' into maint

diff --git a/utf8.c b/utf8.c
index a544f15456656df642253533eaa28885ce3496a6..28791a7c3174924967182d54c8b4a7f9600c87bf 100644 (file)
--- 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;