Re: [PATCH 5/5] merge-recursive: test more consistent interface

2016-02-21 Thread Eric Sunshine
On Sun, Feb 21, 2016 at 2:55 PM, Felipe Gonçalves Assis wrote: > On 21 February 2016 at 15:40, Eric Sunshine wrote: >> Taking the above and review comments from earlier patches into >> account, it might make sense to re-order the series as follows: >> >> 1/5: add --find-renames & --find-renames=

Re: [PATCH 5/5] merge-recursive: test more consistent interface

2016-02-21 Thread Felipe Gonçalves Assis
On 21 February 2016 at 15:40, Eric Sunshine wrote: > On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis > wrote: >> merge-recursive: test more consistent interface > > The real meat of this patch (it seems) is that you're adding tests to > verify that --find-renames= and --rename-threshold=

Re: [PATCH 5/5] merge-recursive: test more consistent interface

2016-02-21 Thread Eric Sunshine
On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis wrote: > merge-recursive: test more consistent interface The real meat of this patch (it seems) is that you're adding tests to verify that --find-renames= and --rename-threshold= are aliases, so it might make sense for the summary line to s

[PATCH 5/5] merge-recursive: test more consistent interface

2016-02-21 Thread Felipe Gonçalves Assis
Update basic tests to use the new option find-renames instead of rename-threshold. Add tests to verify that rename-threshold= behaves as a synonym for find-renames=. Test that find-renames resets threshold. Signed-off-by: Felipe Gonçalves Assis --- t/t3034-merge-recursive-rename-options.sh | 48