Merge branch 'rs/fmt-merge-msg-string-leak-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 19:16:23 +0000 (11:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 19:16:23 +0000 (11:16 -0800)
commit1f9ce78df08120f6a67107ccbc6b1c4658cd1808
tree03d6a9d84bcbf8a6e94a50466f762aa6f561db59
parent5c14bd6175531a31b35f62ff8f1619eff38b06d1
parentaddcf6cfdeb24a2ae589cbdd0ac1e754310b9ca8
Merge branch 'rs/fmt-merge-msg-string-leak-fix'

Leakfix.

* rs/fmt-merge-msg-string-leak-fix:
  fmt-merge-msg: avoid leaking strbuf in shortlog()
builtin/fmt-merge-msg.c