Re: [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l

2018-05-26 Thread Junio C Hamano
Elijah Newren writes: >> I'd expect that a reader of the commit who cares enough to bother to >> wonder by looking at the patch and seeing that 2 became 3 would know >> why already. And a reader of the resulting file would not know that >> the 3 used to be 2, and won't be

Re: [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l

2018-05-25 Thread Elijah Newren
On Thu, May 24, 2018 at 6:17 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >>> -test 2 = $(git ls-files -s | wc -l) && >>> -test 2 = $(git ls-files -u | wc -l) && >>> -test 2 = $(git ls-files -o | wc -l) && >> >>

Re: [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l

2018-05-25 Thread Elijah Newren
On Thu, May 24, 2018 at 6:17 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >>> -test 2 = $(git ls-files -s | wc -l) && >>> -test 2 = $(git ls-files -u | wc -l) && >>> -test 2 = $(git ls-files -o | wc -l) && >> >>

Re: [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l

2018-05-24 Thread Junio C Hamano
SZEDER Gábor writes: >> -test 2 = $(git ls-files -s | wc -l) && >> -test 2 = $(git ls-files -u | wc -l) && >> -test 2 = $(git ls-files -o | wc -l) && > > Here 'git ls-files -o' should have listed two untracked files ... > >> +

Re: [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l

2018-05-24 Thread Elijah Newren
On Thu, May 24, 2018 at 3:05 AM, SZEDER Gábor wrote: >> --- a/t/t6036-recursive-corner-cases.sh >> +++ b/t/t6036-recursive-corner-cases.sh >> @@ -65,9 +65,12 @@ test_expect_success 'merge simple rename+criss-cross with >> no modifications' ' >> >>

Re: [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l

2018-05-24 Thread SZEDER Gábor
On Thu, May 24, 2018 at 12:05 PM, SZEDER Gábor wrote: > >> Signed-off-by: Elijah Newren >> --- >> t/t6036-recursive-corner-cases.sh| 102 ++- >> t/t6042-merge-rename-corner-cases.sh | 99 +- >> 2 files

Re: [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l

2018-05-24 Thread SZEDER Gábor
> Signed-off-by: Elijah Newren > --- > t/t6036-recursive-corner-cases.sh| 102 ++- > t/t6042-merge-rename-corner-cases.sh | 99 +- > 2 files changed, 134 insertions(+), 67 deletions(-) > > diff --git

[PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l

2018-05-24 Thread Elijah Newren
Signed-off-by: Elijah Newren --- t/t6036-recursive-corner-cases.sh| 102 ++- t/t6042-merge-rename-corner-cases.sh | 99 +- 2 files changed, 134 insertions(+), 67 deletions(-) diff --git a/t/t6036-recursive-corner-cases.sh