mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
Merge branch 'nd/pretty-formats'
* nd/pretty-formats: pretty: Fix bug in truncation support for %>, %< and %><
This commit is contained in:
commit
c85f0a2a0e
1 changed files with 2 additions and 2 deletions
4
utf8.c
4
utf8.c
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue