From: Felipe Gonçalves Assis Date: Wed, 17 Feb 2016 03:38:23 GMT Subject: Re: [PATCH v3 0/2] merge-recursive: option to disable renames Message-ID: In-Reply-To: On 16 February 2016 at 23:37, Eric Sunshine wrote: > On Tue, Feb 16, 2016 at 8:11 PM, Felipe Gonçalves Assis > wrote: >> No more renames option. rename-threshold enables renames. > > Can you add some tests? Off the top of my head, I'd expect to see at > least three new tests: > > 1. --no-renames works as expected > 2. last wins in "--no-renames --rename-threshold=x" > 3. last wins in "--rename-threshold=x --no-renames" > Sure. Just a heads up: For the next three days I will have very little time, so I will start tackling this on the weekend. I submitted a fourth version of the patch without the tests, so that this part of the work can proceed in parallel. Thanks, Felipe