Merge branch 'nd/pretty-formats'

* nd/pretty-formats:
  pretty: Fix bug in truncation support for %>, %< and %><
This commit is contained in:
Junio C Hamano 2013-04-28 12:10:03 -07:00
commit c85f0a2a0e

4
utf8.c
View file

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