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>
Michael Haggerty committed
Oct 1, 2014 at 12:28 UTC
1fef4b5041e0144e476ffcc8c559bf06fa80340c
1 file changed
-1
builtin/merge.c
-1
@@ -668,7 +668,6 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
668
if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
669
int clean, x;
670
struct commit *result;
671
- struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
671
struct commit_list *reversed = NULL;
672
struct merge_options o;
673
struct commit_list *j;