| commit | e47dbece39712567a36a096010c5c1223119f7e3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 May 2018 12:51:29 +0000 (30 21:51 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 May 2018 12:51:29 +0000 (30 21:51 +0900) | ||
| tree | aced74e797a0c37931e367574bdd60cbfb63e0f4 | treesnapshot (tar.gz zip) |
| parent | 9472b13201aea57d7f9212ca2678aba4d6dbdfdb | commitdiff |
| parent | 1c41d2805e42d77d943fd3d79ebf5136f74c9ba3 | commitdiff |
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()`
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()`