diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-28 12:10:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-28 12:10:03 -0700 |
commit | c85f0a2a0e399cf88f318113225700693a6039a2 (patch) | |
tree | 37ba047035f2eb5936bb8729572797c8611770c3 | |
parent | a6fed65a6aae37bb7e126674d44587b828e90e52 (diff) | |
parent | 980419b99306b326d44d740a95f3401e169ad943 (diff) | |
download | git-c85f0a2a0e399cf88f318113225700693a6039a2.tar.gz |
Merge branch 'nd/pretty-formats'
* nd/pretty-formats:
pretty: Fix bug in truncation support for %>, %< and %><
-rw-r--r-- | utf8.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -463,8 +463,8 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width, w += n; } strbuf_setlen(&sb_dst, dst - sb_dst.buf); - strbuf_attach(sb_src, strbuf_detach(&sb_dst, NULL), - sb_dst.len, sb_dst.alloc); + strbuf_swap(sb_src, &sb_dst); + strbuf_release(&sb_dst); } int is_encoding_utf8(const char *name) |