From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 12:51:29 +0000 (+0900)
Subject: Merge branch 'ma/unpack-trees-free-msgs'
X-Git-Tag: v2.18.0-rc0~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e47dbece39712567a36a096010c5c1223119f7e3;p=thirdparty%2Fgit.git

Merge branch 'ma/unpack-trees-free-msgs'

Leak plugging.

* ma/unpack-trees-free-msgs:
  unpack_trees_options: free messages when done
  argv-array: return the pushed string from argv_push*()
  merge-recursive: provide pair of `unpack_trees_{start,finish}()`
  merge: setup `opts` later in `checkout_fast_forward()`
---

e47dbece39712567a36a096010c5c1223119f7e3