From: Michael Haggerty Date: Fri, 26 Sep 2014 10:08:26 GMT Subject: [PATCH v6 26/39] try_merge_strategy(): remove redundant lock_file allocation Message-ID: <1411726119-31598-27-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1411726119-31598-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 ec6fa93..cb8f709 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -668,7 +668,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