From: Michael Haggerty Date: Sat, 06 Sep 2014 07:50:39 GMT Subject: [PATCH v4 25/32] try_merge_strategy(): remove redundant lock_file allocation Message-ID: <1409989846-22401-26-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1409989846-22401-1-git-send-email-mhagger@alum.mit.edu> By the time the "if" block is entered, the lock_file instance from the main function block is no longer in use, so re-use that one instead of allocating a second one. Note that the "lock" variable in the "if" block shadowed the "lock" variable at function scope, so the only change needed is to remove the inner definition. Signed-off-by: Michael Haggerty --- builtin/merge.c | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/merge.c b/builtin/merge.c index ce82eb2..0f5c185 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -669,7 +669,6 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) { int clean, x; struct commit *result; - struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); struct commit_list *reversed = NULL; struct merge_options o; struct commit_list *j; -- 2.1.0