Re: [PATCH 3/5] merge-recursive: test rename threshold option

2016-02-21 Thread Junio C Hamano
Eric Sunshine writes: > On Sun, Feb 21, 2016 at 1:55 PM, Felipe Gonçalves Assis > wrote: >> On 21 February 2016 at 14:52, Eric Sunshine wrote: >>> On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis >>>

Re: [PATCH 3/5] merge-recursive: test rename threshold option

2016-02-21 Thread Eric Sunshine
On Sun, Feb 21, 2016 at 1:55 PM, Felipe Gonçalves Assis wrote: > On 21 February 2016 at 14:52, Eric Sunshine wrote: >> On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis >> wrote: >>> +test_expect_success 'rename

Re: [PATCH 3/5] merge-recursive: test rename threshold option

2016-02-21 Thread Felipe Gonçalves Assis
On 21 February 2016 at 14:52, Eric Sunshine wrote: > On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis > wrote: >> merge-recursive: test rename threshold option > >> + git read-tree --reset -u HEAD && >> + test_must_fail git

[PATCH 3/5] merge-recursive: test rename threshold option

2016-02-21 Thread Felipe Gonçalves Assis
Commit 10ae7526bebb505ba01f76ec97d5f7b5e0e5 introduced this feature, but did not include any tests. This commit fixes this. Signed-off-by: Felipe Gonçalves Assis --- t/t3034-merge-recursive-rename-threshold.sh | 146 1 file changed, 146

Re: [PATCH 3/5] merge-recursive: test rename threshold option

2016-02-21 Thread Eric Sunshine
On Sun, Feb 21, 2016 at 10:09 AM, Felipe Gonçalves Assis wrote: > merge-recursive: test rename threshold option Maybe rephrase this as: t3034: add rename threshold tests > Commit 10ae7526bebb505ba01f76ec97d5f7b5e0e5 introduced this feature, In commit messages,