From: Jeff King <peff@peff.net>
Date: Fri, 29 Feb 2008 22:53:31 GMT
Subject: Re: [PATCH] t6024-recursive-merge.sh: hide spurious output when not running verbosely
Message-ID: <20080229225331.GA8440@coredump.intra.peff.net>
In-Reply-To: <1204323805-23185-1-git-send-email-mh@glandium.org>

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'

?

-Peff