On 21/10/15 17:05, Torsten Bögershausen wrote:
> On 21.10.15 16:37, Ramsay Jones wrote:
>> Hi Junio,
>>
>> While testing the next branch today, I had a test failure, viz:
>>
>> $ tail ntest-out-fail
>> Test Summary Report
>> -------------------
>> t7063-status-untracked-cache.sh (Wstat: 256 Tests: 32
>> Failed: 22)
>
> Does this patch help ?
> (Recently send & tested by David. I just copy & paste the diff)
> []
>
No, that patch is already in next and was part of the build
that failed:
$ git log -1 --oneline 9b680fbd3
9b680fb t7063: fix flaky untracked-cache test
$ git branch --contains 9b680fbd3
* next
pu
$
Again, I haven't been able to reproduce the failure ...
[I should have said the this is today's next branch
@ 3b31934 Sync with master. This is on Linux Mint 17.2]
Thanks.
ATB,
Ramsay Jones
> Signed-off-by: David Turner <[email protected]>
> ---
> t/t7063-status-untracked-cache.sh | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/t/t7063-status-untracked-cache.sh
> b/t/t7063-status-untracked-cache.sh
> index 37a24c1..0e8d0d4 100755
> --- a/t/t7063-status-untracked-cache.sh
> +++ b/t/t7063-status-untracked-cache.sh
> @@ -412,7 +412,9 @@ test_expect_success 'create/modify files, some of which
> are gitignored' '
> echo two bis >done/two &&
> echo three >done/three && # three is gitignored
> echo four >done/four && # four is gitignored at a higher level
> - echo five >done/five # five is not gitignored
> + echo five >done/five && # five is not gitignored
> + echo test >base && #we need to ensure that the root dir is touched
> + rm base
> '
>
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
