On Wed, 20 May 2020 at 00:21, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Adam Dinwoodie <adam@xxxxxxxxxxxxx> writes:
>
> >> tests: when run in Bash, annotate test failures with file name/line number
> >
> > At least on Cygwin, this breaks the test output parsing of failures
> > when running with prove.
>
> We'll revert this problematic topic out (which hasn't happened yet),
> which I hopefully will be able to merge to 'master' before tagging
> the -rc1 release candidate.
>
> If possible, could you test the result of merging e31600b0 (Revert
> "tests: when run in Bash, annotate test failures with file name/line
> number", 2020-05-15) into 'master'?
I get a merge conflict due to 303775a25f ("t/test_lib: avoid naked
bash arrays in file_lineno", 2020-05-07), but resolving that in the
obvious fashion and the test summaries are working as expected again.
