diff options
author | Elijah Newren <newren@gmail.com> | 2018-05-20 13:17:35 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-21 00:56:15 +0300 |
commit | 3f1c1c360080114fcc9492211601f41d56112e3c (patch) | |
tree | 8cf815fa9e81bc8c7456ec88e27aadbbd9fe14c9 /argv-array.c | |
parent | 89e653da5b1bee9cf645e9d4bdd95f6bb31cc4b9 (diff) |
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 'argv-array.c')
0 files changed, 0 insertions, 0 deletions