Merge branch 'nd/strbuf-utf8-replace' into jch
commitbccb031e1715f4eae891b927b68be0fcaa68767b
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:33:42 +0000 (25 12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:33:42 +0000 (25 12:33 -0700)
treed8d31991e5d3de4783d50619b73d56222d1b8e80
parentcd517360feaef3c79964bbf4707b223096c892c8
parent430875969a5229c1d306e4cc5acc8c8afe2b50a3
Merge branch 'nd/strbuf-utf8-replace' into jch

* nd/strbuf-utf8-replace:
  utf8.c: fix strbuf_utf8_replace() consuming data beyond input string
t/t4205-log-pretty-formats.sh
utf8.c