| commit | 1fef4b5041e0144e476ffcc8c559bf06fa80340c | |
| author | Michael Haggerty <mhagger@alum.mit.edu> | |
| Wed, 1 Oct 2014 10:28:29 +0000 (1 12:28 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Oct 2014 20:49:00 +0000 (1 13:49 -0700) | ||
| tree | fa5c24d9b573a6948c96af079ad850003006be20 | treesnapshot (tar.gz zip) |
| parent | 2091c5062c6fd928e1ad3e7c059243e597cb8bbf | commitdiff |
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>
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>
| builtin/merge.c | diffblobblamehistory |