On Fri, Mar 9, 2018 at 12:33 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > SZEDER Gábor <szeder.dev@xxxxxxxxx> writes: > >> diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh >> index c30660d606..5ff3789199 100755 >> --- a/t/t9400-git-cvsserver-server.sh >> +++ b/t/t9400-git-cvsserver-server.sh >> @@ -449,10 +449,9 @@ test_expect_success 'cvs update (-p)' ' >> GIT_CONFIG="$git_config" cvs update && >> rm -f failures && >> for i in merge no-lf empty really-empty; do >> - GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out >> - test_cmp $i.out ../$i >>failures 2>&1 >> - done && >> - test -z "$(cat failures)" >> + GIT_CONFIG="$git_config" cvs update -p "$i" >$i.out && >> + test_cmp $i.out ../$i || return 1 >> + done >> ' > > This makes "rm -f failures &&" unnecessary, no? Indeed, it does.
