| commit | daccee387a7f3e4ca332649d5311b032a71892e2 | |
| author | Michael Haggerty <mhagger@alum.mit.edu> | |
| Wed, 1 Oct 2014 10:28:30 +0000 (1 12:28 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Oct 2014 20:49:01 +0000 (1 13:49 -0700) | ||
| tree | bdb445badb63b2ddc580f62f1812d200668e5bad | treesnapshot (tar.gz zip) |
| parent | 1fef4b5041e0144e476ffcc8c559bf06fa80340c | commitdiff |
try_merge_strategy(): use a statically-allocated lock_file object
Even the one lockfile object needn't be allocated each time the
function is called. Instead, define one statically-allocated
lock_file object and reuse it for every call.
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Even the one lockfile object needn't be allocated each time the
function is called. Instead, define one statically-allocated
lock_file object and reuse it for every call.
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |