git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1fef4b5)
try_merge_strategy(): use a statically-allocated lock_file object
authorMichael Haggerty <redacted>
Wed, 1 Oct 2014 10:28:30 +0000 (12:28 +0200)
committerJunio C Hamano <redacted>
Wed, 1 Oct 2014 20:49:01 +0000 (13:49 -0700)
commitdaccee387a7f3e4ca332649d5311b032a71892e2
treebdb445badb63b2ddc580f62f1812d200668e5badtree | snapshot
parent1fef4b5041e0144e476ffcc8c559bf06fa80340ccommit | diff
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 <redacted>
Signed-off-by: Michael Haggerty <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge.c diff | blob | history
git clone https://git.99rst.org/PROJECT