From: Jonathan Nieder Date: Sun, 21 Mar 2010 02:01:20 +0000 (-0500) Subject: revert: fix tiny memory leak in cherry-pick --ff X-Git-Tag: v1.7.1-rc0~36^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=28db756feead84929cdfaaee8bccd301384daab4;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-revert.c b/builtin-revert.c index 476f41e76..9a3c14c32 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -274,7 +274,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) int i, index_fd, clean; char *oneline, *reencoded_message = NULL; const char *message, *encoding; - char *defmsg = git_pathdup("MERGE_MSG"); + char *defmsg = NULL; struct merge_options o; struct tree *result, *next_tree, *base_tree, *head_tree; static struct lock_file index_lock; @@ -364,6 +364,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) * reverse of it if we are revert. */ + defmsg = git_pathdup("MERGE_MSG"); msg_fd = hold_lock_file_for_update(&msg_file, defmsg, LOCK_DIE_ON_ERROR);