diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-08-01 13:44:53 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-01 11:45:30 -0700 |
commit | 548009c0d58c74dde2c51f675b369b4c50878f1b (patch) | |
tree | 8f67f25695a6b87eea5067fce0ba179e1aea4fd9 /builtin/stripspace.c | |
parent | merge-recursive: offer an option to retain the output in 'obuf' (diff) | |
download | tgif-548009c0d58c74dde2c51f675b369b4c50878f1b.tar.xz |
merge_trees(): ensure that the callers release output buffer
The recursive merge machinery accumulates its output in an output
buffer, to be flushed at the end of merge_recursive(). At this point,
we forgot to release the output buffer.
When calling merge_trees() (i.e. the non-recursive part of the recursive
merge) directly, the output buffer is never flushed because the caller
may be merge_recursive() which wants to flush the output itself.
For the same reason, merge_trees() cannot release the output buffer: it
may still be needed.
Forgetting to release the output buffer did not matter much when running
git-checkout, or git-merge-recursive, because we exited after the
operation anyway. Ever since cherry-pick learned to pick a commit range,
however, this memory leak had the potential of becoming a problem.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/stripspace.c')
0 files changed, 0 insertions, 0 deletions