kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'nd/pretty-formats' 

* nd/pretty-formats:
  pretty: Fix bug in truncation support for %>, %< and %><
maint
Junio C Hamano 2013-04-28 12:10:03 -07:00
parent a6fed65a6a 980419b993
commit c85f0a2a0e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utf8.c
View File

@ -463,8 +463,8 @@ void strbuf_utf8_replace(struct strbuf *sb_src, int pos, int width,
w += n; w += n;
} }
strbuf_setlen(&sb_dst, dst - sb_dst.buf); strbuf_setlen(&sb_dst, dst - sb_dst.buf);
strbuf_attach(sb_src, strbuf_detach(&sb_dst, NULL), strbuf_swap(sb_src, &sb_dst);
sb_dst.len, sb_dst.alloc); strbuf_release(&sb_dst);
} }


int is_encoding_utf8(const char *name) int is_encoding_utf8(const char *name)