From: Junio C Hamano <gitster@pobox.com>
To: Mike Hommey <mh@glandium.org>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] t6024-recursive-merge.sh: hide spurious output when not running verbosely
Date: Fri, 29 Feb 2008 15:15:32 -0800 [thread overview]
Message-ID: <7vfxvbbbhn.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080229225816.GA24892@glandium.org> (Mike Hommey's message of "Fri, 29 Feb 2008 23:58:16 +0100")
Mike Hommey <mh@glandium.org> writes:
> 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 ?
No, it is about setting the stage to perform the test in
question, so it belongs inside.
next prev parent reply other threads:[~2008-02-29 23:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-29 22:23 [PATCH] t6024-recursive-merge.sh: hide spurious output when not running verbosely Mike Hommey
2008-02-29 22:53 ` Jeff King
2008-02-29 22:58 ` Mike Hommey
2008-02-29 23:01 ` Jeff King
2008-02-29 23:15 ` Junio C Hamano [this message]
2008-02-29 23:54 ` Jeff King
2008-02-29 23:34 ` Johannes Schindelin
2008-02-29 23:50 ` Junio C Hamano
2008-03-01 4:10 ` Jeff King
2008-03-01 4:27 ` Shawn O. Pearce
2008-03-01 4:28 ` Jeff King
2008-03-01 5:40 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vfxvbbbhn.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mh@glandium.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).