Re: [PATCH v6 27/39] try_merge_strategy(): use a statically-allocated lock_file object

2014-09-30 Thread Junio C Hamano
Michael Haggerty writes: > On 09/26/2014 09:00 PM, Junio C Hamano wrote: >> Michael Haggerty writes: >> >>> 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. >>> >>>

Re: [PATCH v6 27/39] try_merge_strategy(): use a statically-allocated lock_file object

2014-09-30 Thread Michael Haggerty
On 09/26/2014 09:00 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >> 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 >> Signed-

Re: [PATCH v6 27/39] try_merge_strategy(): use a statically-allocated lock_file object

2014-09-26 Thread Junio C Hamano
Michael Haggerty writes: > 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 > Signed-off-by: Michael Haggerty > --- > ... > - hold_locke

[PATCH v6 27/39] try_merge_strategy(): use a statically-allocated lock_file object

2014-09-26 Thread Michael Haggerty
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 Signed-off-by: Michael Haggerty --- builtin/merge.c | 14 +++--- 1 file changed, 7 insertio