| commit | 443a12f37be1c5967785b83bf04935fe357afb9b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 May 2017 04:21:06 +0000 (8 13:21 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 May 2017 04:12:15 +0000 (9 21:12 -0700) | ||
| tree | 2bf57febbd38bb9443113c89ec308306b5eaadb2 | treesnapshot (tar.gz zip) |
| parent | d32de66a07c600c14f70e6d435f8f9c496b0d625 | commitdiff |
checkout: fix memory leak
When "git checkout -m" does an in-core three-way merge to carry
local modifications forward to check out a different branch, the
code forgot to free the updated contents it has in-core.
Noticed-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When "git checkout -m" does an in-core three-way merge to carry
local modifications forward to check out a different branch, the
code forgot to free the updated contents it has in-core.
Noticed-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/checkout.c | diffblobblamehistory |