From: Mike Hommey <mh@glandium.org>
Date: Fri, 29 Feb 2008 22:58:16 GMT
Subject: Re: [PATCH] t6024-recursive-merge.sh: hide spurious output when not running verbosely
Message-ID: <20080229225816.GA24892@glandium.org>
In-Reply-To: <20080229225331.GA8440@coredump.intra.peff.net>

On Fri, Feb 29, 2008 at 05:53:31PM -0500, Jeff King wrote:
> On Fri, Feb 29, 2008 at 11:23:25PM +0100, Mike Hommey wrote:
> 
> >  test_expect_success "virtual trees were processed" "git diff expect out"
> >  
> > -git reset --hard
> > +git reset --hard >&3 2>&4
> >  test_expect_success 'refuse to merge binary files' '
> >  	printf "\0" > binary-file &&
> >  	git add binary-file &&
> 
> Should this perhaps just be:
> 
>   test_expect_success 'reset state' 'git reset --hard'

Is it really about testing git reset ?

Mike