From: Jeff King <peff@peff.net>
Date: Fri, 29 Feb 2008 23:54:43 GMT
Subject: Re: [PATCH] t6024-recursive-merge.sh: hide spurious output when not running verbosely
Message-ID: <20080229235442.GA20028@sigill.intra.peff.net>
In-Reply-To: <7vfxvbbbhn.fsf@gitster.siamese.dyndns.org>

On Fri, Feb 29, 2008 at 03:15:32PM -0800, Junio C Hamano wrote:

> >> >  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 ?
> 
> No, it is about setting the stage to perform the test in
> question, so it belongs inside.

That sounds reasonable to me.

-Peff