diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-05-20 12:17:35 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-21 06:56:15 +0900 |
| commit | 3f1c1c360080114fcc9492211601f41d56112e3c (patch) | |
| tree | 8cf815fa9e81bc8c7456ec88e27aadbbd9fe14c9 /compat/inet_ntop.c | |
| parent | merge: setup `opts` later in `checkout_fast_forward()` (diff) | |
| download | tgif-3f1c1c360080114fcc9492211601f41d56112e3c.tar.xz | |
merge-recursive: provide pair of `unpack_trees_{start,finish}()`
Rename `git_merge_trees()` to `unpack_trees_start()` and extract the
call to `discard_index()` into a new function `unpack_trees_finish()`.
As a result, these are called early resp. late in `merge_trees()`,
making the resource handling clearer. A later commit will expand on
that, teaching `..._finish()` to free more memory. (So rather than
moving the FIXME-comment, just drop it, since it will be addressed soon
enough.)
Also call `..._finish()` when `merge_trees()` returns early.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/inet_ntop.c')
0 files changed, 0 insertions, 0 deletions