diff options
author | Elijah Newren <newren@gmail.com> | 2021-01-23 22:01:10 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-23 23:30:06 -0800 |
commit | cf8937acdedc80e636587f5fc2f495ea38bd5fe0 (patch) | |
tree | 341d785060fb62d6be8746a8b959ddd4488fb806 /Documentation/RelNotes/2.1.2.txt | |
parent | Merge branch 'en/ort-directory-rename' into en/merge-ort-perf (diff) | |
download | tgif-cf8937acdedc80e636587f5fc2f495ea38bd5fe0.tar.xz |
merge-ort: fix massive leak
When a series of merges was performed (such as for a rebase or series of
cherry-picks), only the data structures allocated by the final merge
operation were being freed. The problem was that while picking out
pieces of merge-ort to upstream, I previously misread a certain section
of merge_start() and assumed it was associated with a later
optimization. Include that section now, which ensures that if there was
a previous merge operation, that we clear out result->priv and then
re-use it for opt->priv, and otherwise we allocate opt->priv.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.1.2.txt')
0 files changed, 0 insertions, 0 deletions