summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-03-20 21:01:20 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-20 19:25:48 -0700
commit28db756feead84929cdfaaee8bccd301384daab4 (patch)
tree9b37553d3d40a0d238cd4ce10e47a96f03d9d920 /builtin/merge.c
parentrebase -i: use new --ff cherry-pick option (diff)
downloadtgif-28db756feead84929cdfaaee8bccd301384daab4.tar.xz
revert: fix tiny memory leak in cherry-pick --ff
We forgot to free defmsg when returning early for a fast-forward. Fixing this should reduce noise during test suite runs with valgrind. More importantly, once cherry-pick learns to pick multiple commits, the amount of memory leaked would start to add up. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions