Re: [PATCH v1 2/2] merge: Add merge.aggressive config setting

2018-04-25 Thread Ben Peart
On 4/24/2018 7:57 PM, Junio C Hamano wrote: Ben Peart writes: That said, it makes sense to me to do this when rename detection is turned off. In fact, I think you'd automatically want to set aggressive to true whenever rename detection is turned off (whether by your merge.renames option or

Re: [PATCH v1 2/2] merge: Add merge.aggressive config setting

2018-04-24 Thread Junio C Hamano
Ben Peart writes: > That said, it makes sense to me to do >> this when rename detection is turned off. In fact, I think you'd >> automatically want to set aggressive to true whenever rename detection >> is turned off (whether by your merge.renames option or the >> -Xno-renames flag). >> ... > >

Re: [PATCH v1 2/2] merge: Add merge.aggressive config setting

2018-04-24 Thread Elijah Newren
Hi Ben, On Tue, Apr 24, 2018 at 9:45 AM, Ben Peart wrote: > On 4/20/2018 1:22 PM, Elijah Newren wrote: >> On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart >> wrote: >>> >>> Add the ability to control the aggressive flag passed to read-tree via a >>> config setting. >> >> This feels like a workaround t

Re: [PATCH v1 2/2] merge: Add merge.aggressive config setting

2018-04-24 Thread Ben Peart
On 4/20/2018 1:22 PM, Elijah Newren wrote: On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: Add the ability to control the aggressive flag passed to read-tree via a config setting. This feels like a workaround to the performance problems with index updates in merge-recursive.c. This c

Re: [PATCH v1 2/2] merge: Add merge.aggressive config setting

2018-04-20 Thread Elijah Newren
On Fri, Apr 20, 2018 at 6:36 AM, Ben Peart wrote: > Add the ability to control the aggressive flag passed to read-tree via a > config setting. This feels like a workaround to the performance problems with index updates in merge-recursive.c. That said, it makes sense to me to do this when rename