diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:40:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:40:34 -0800 |
| commit | 71288e15dfd6638d14b307b564d1230a4500daa1 (patch) | |
| tree | 7e81aaa5b75de0df9c359838094c82a06c635dce /utf8.h | |
| parent | b05d8c62d306071729eb3d905042385bb93b9fcd (diff) | |
| parent | e0db1765c3bb108b55ebf82b4e5962f9d1f5e5b7 (diff) | |
Merge branch 'sp/shortlog-missing-lf'
When a line to be wrapped has a solid run of non space characters whose length exactly is the wrap width, "git shortlog -w" failed to add a newline after such a line. * sp/shortlog-missing-lf: strbuf_add_wrapped*(): Remove unused return value shortlog: fix wrapping lines of wraplen
Diffstat (limited to 'utf8.h')
| -rw-r--r-- | utf8.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utf8.h b/utf8.h index 93ef60042c..a214238bdd 100644 --- a/utf8.h +++ b/utf8.h @@ -9,9 +9,9 @@ int is_utf8(const char *text); int is_encoding_utf8(const char *name); int same_encoding(const char *, const char *); -int strbuf_add_wrapped_text(struct strbuf *buf, +void strbuf_add_wrapped_text(struct strbuf *buf, const char *text, int indent, int indent2, int width); -int strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len, +void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len, int indent, int indent2, int width); #ifndef NO_ICONV |