Skip to content

Commit

Permalink
Merge branch 'nd/pretty-formats'
Browse files Browse the repository at this point in the history
* nd/pretty-formats:
  pretty: Fix bug in truncation support for %>, %< and %><
  • Loading branch information
Junio C Hamano committed Apr 28, 2013
2 parents a6fed65 + 980419b commit c85f0a2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions utf8.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c85f0a2

Please sign in to comment.