From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Wed, 1 Oct 2014 10:28:29 +0000 (+0200)
Subject: try_merge_strategy(): remove redundant lock_file allocation
X-Git-Tag: v2.2.0-rc0~53^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fef4b5041e0144e476ffcc8c559bf06fa80340c;p=thirdparty%2Fgit.git

try_merge_strategy(): remove redundant lock_file allocation

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 <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/merge.c b/builtin/merge.c
index dff043dac3..1ec39394af 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;