summaryrefslogtreecommitdiff
path: root/builtin/hash-object.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-05-08 13:21:06 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-09 21:12:15 -0700
commit443a12f37be1c5967785b83bf04935fe357afb9b (patch)
tree2bf57febbd38bb9443113c89ec308306b5eaadb2 /builtin/hash-object.c
parentsubmodule_uses_worktrees(): plug memory leak (diff)
downloadtgif-443a12f37be1c5967785b83bf04935fe357afb9b.tar.xz
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>
Diffstat (limited to 'builtin/hash-object.c')
0 files changed, 0 insertions, 0 deletions