From: Michael J Gruber <git@drmicha•warpmail.net>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org, Matthieu Moy <Matthieu.Moy@imag•fr>,
Ivo Anjo <ivo.anjo@ist•utl.pt>
Subject: Re: [PATCHv2 1/2] t7508: test git status -v
Date: Wed, 04 Mar 2015 12:05:58 +0100 [thread overview]
Message-ID: <54F6E716.5050808@drmicha.warpmail.net> (raw)
In-Reply-To: <xmqqioehafb2.fsf@gitster.dls.corp.google.com>
Junio C Hamano venit, vidit, dixit 03.03.2015 23:26:
> Junio C Hamano <gitster@pobox•com> writes:
>
>> Michael J Gruber <git@drmicha•warpmail.net> writes:
>>
>>> Signed-off-by: Michael J Gruber <git@drmicha•warpmail.net>
>>> ---
>>> t/t7508-status.sh | 6 ++++++
>>> 1 file changed, 6 insertions(+)
>>>
>>> diff --git a/t/t7508-status.sh b/t/t7508-status.sh
>>> index 8ed5788..4989e98 100755
>>> --- a/t/t7508-status.sh
>>> +++ b/t/t7508-status.sh
>>> @@ -133,6 +133,12 @@ test_expect_success 'status with status.displayCommentPrefix=false' '
>>> test_i18ncmp expect output
>>> '
>>>
>>> +test_expect_success 'status -v' '
>>> + git diff --cached >>expect &&
>>
>> This makes the test rely on the previous one succeeding. Do we
>> care, or is reproducing what ought to be in 'expect' at this step
>> too expensive?
>
> Ahh, OK. The way the existing tests prepare 'expect' is "by hand".
>
> So I think what is wrong with this new test is not that relies on
> the current contents of 'expect', but that it modifies it (imagine
> being a merge/patch monkey who has to accept this change while a
> change from somebody else that wants to add another test that relies
> on the original 'expect' intact and then have to scratch his or her
> head when the two topics are merged, wondering why the latter test
> starts failing).
>
> Perhaps
>
> ( cat expect && git diff --cached ) >expect-with-v &&
> git status -v >actual &&
> test_cmp expect-with-v actual
>
> or something?
That's what I had first, but the new file shows up as untracked file in
the status output...
I don't mind setting this one up by hand also, if you prefer.
Michael
next prev parent reply other threads:[~2015-03-04 11:06 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 8:56 How to prevent empty git commit --amend Ivo Anjo
2015-01-13 8:59 ` Daniel Knittl-Frank
2015-01-13 10:22 ` Ivo Anjo
2015-01-13 11:20 ` Michael J Gruber
2015-01-14 10:00 ` Matthieu Moy
2015-01-14 12:15 ` Ivo Anjo
2015-01-14 12:45 ` Matthieu Moy
2015-01-14 17:27 ` Junio C Hamano
2015-01-14 17:36 ` Junio C Hamano
2015-01-15 16:08 ` [RFC/PATCH] commit/status: show the index-worktree with -v -v Michael J Gruber
2015-01-15 20:11 ` Junio C Hamano
2015-01-15 20:38 ` Junio C Hamano
2015-01-16 8:13 ` Michael J Gruber
2015-03-03 14:16 ` [PATCHv2 0/2] More diffs for commit/status Michael J Gruber
2015-03-03 14:16 ` [PATCHv2 1/2] t7508: test git status -v Michael J Gruber
2015-03-03 21:20 ` Junio C Hamano
2015-03-03 22:26 ` Junio C Hamano
2015-03-04 11:05 ` Michael J Gruber [this message]
2015-03-04 21:27 ` Junio C Hamano
2015-03-03 14:16 ` [PATCHv2 2/2] commit/status: show the index-worktree diff with -v -v Michael J Gruber
2015-03-03 21:26 ` Junio C Hamano
2015-03-04 11:11 ` Michael J Gruber
2015-03-04 21:13 ` Junio C Hamano
2015-03-05 14:13 ` [PATCHv3 0/3]More diffs for commit/status Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 1/3] t7508: .gitignore 'expect' and 'output' files Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 2/3] t7508: test git status -v Michael J Gruber
2015-03-05 14:13 ` [PATCHv3 3/3] commit/status: show the index-worktree diff with -v -v Michael J Gruber
2015-03-05 19:25 ` [PATCHv3 0/3]More diffs for commit/status Junio C Hamano
2015-03-05 20:15 ` Junio C Hamano
2015-03-05 20:27 ` 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=54F6E716.5050808@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=Matthieu.Moy@imag$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=ivo.anjo@ist$(echo .)utl.pt \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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