From: Junio C Hamano <gitster@pobox•com>
To: Paul Tan <pyokagan@gmail•com>
Cc: Michael Blume <blume.mike@gmail•com>,
Git List <git@vger•kernel.org>,
Stefan Beller <sbeller@google•com>,
Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: Re: [PATCH v3 1/9] t5520: fixup file contents comparisons
Date: Sat, 16 May 2015 11:57:14 -0700 [thread overview]
Message-ID: <xmqq617sfj05.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CACRoPnSP9xfyW47ZqU7QO5o4tyzROh4hGRPqG9g9OB5cquS+uw@mail.gmail.com> (Paul Tan's message of "Sat, 16 May 2015 21:49:52 +0800")
Paul Tan <pyokagan@gmail•com> writes:
> Hi Junio,
>
> On Sat, May 16, 2015 at 2:37 AM, Junio C Hamano <gitster@pobox•com> wrote:
>> Just to avoid misunderstanding, please do not remove 'verbose '
>> blindly without thinking while doing so, as you already did 1/3 of
>> the necessary job to make things better.
>
> Eh? I thought we established that using "verbose" does not provide
> anything more than what "set -x" already provides. So at the very
> least, its use should be removed completely.
I did not mean "do not remove and keep them". I meant "do not
remove without thinking; instead, take mental notes on patterns
these silent ones may have while removing them".
>> You might have noticed, while adding them, there were something
>> common that we currently do with a bare 'test' only because we
>> haven't identified common needs. As I already said,...
>> ...
>> That would be an improvement (and that is the remaining 2/3 ;-).
>
> Yeah, this kind of comparison with file contents is something that is
> done often in t5520, so I agree with adding it.
>
> However, what about these kind of tests:
>
> test new = "$(git show HEAD:file2)"
>
> or these:
>
> test $(git rev-parse HEAD^2) = $(git rev-parse keep-merge)
>
> So, perhaps we could introduce a generic function like:
It all depends on how common they are.
> So the first example would be:
>
> test_output "git show HEAD:file2" new
Simple things like that look fine, but when a variable is involved,
use of eval combined with the fact that the test body is inside sq,
makes the callers unnecessarily ugly.
test_expect_success 'some title' '
var=$(...) &&
test_output "git show \$var:file2 | sed -e \"s/$old/$new/\"" new
'
Which is the concern this shares with the other one I sent about
counting the number of lines in the output from a command that made
me hesitate to suggest it.
So I dunno.
next prev parent reply other threads:[~2015-05-16 18:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-13 9:08 [PATCH v3 0/9] Improve git-pull test coverage Paul Tan
2015-05-13 9:08 ` [PATCH v3 1/9] t5520: fixup file contents comparisons Paul Tan
2015-05-13 14:01 ` Junio C Hamano
2015-05-13 14:42 ` Junio C Hamano
2015-05-14 17:29 ` Michael Blume
2015-05-14 17:44 ` Junio C Hamano
2015-05-15 11:41 ` Paul Tan
2015-05-15 18:37 ` Junio C Hamano
2015-05-15 19:22 ` Junio C Hamano
2015-05-16 13:49 ` Paul Tan
2015-05-16 18:57 ` Junio C Hamano [this message]
2015-05-16 23:32 ` Junio C Hamano
2015-05-17 7:47 ` Paul Tan
2015-05-13 9:08 ` [PATCH v3 2/9] t5520: ensure origin refs are updated Paul Tan
2015-05-13 14:27 ` Junio C Hamano
2015-05-18 13:09 ` Paul Tan
2015-05-13 9:08 ` [PATCH v3 3/9] t5520: test no merge candidates cases Paul Tan
2015-05-13 9:08 ` [PATCH v3 4/9] t5520: test for failure if index has unresolved entries Paul Tan
2015-05-13 9:32 ` Matthieu Moy
2015-05-15 8:25 ` Paul Tan
2015-05-13 9:08 ` [PATCH v3 5/9] t5520: test work tree fast-forward when fetch updates head Paul Tan
2015-05-13 9:08 ` [PATCH v3 6/9] t5520: test --rebase with multiple branches Paul Tan
2015-05-13 9:08 ` [PATCH v3 7/9] t5520: test --rebase failure on unborn branch with index Paul Tan
2015-05-13 9:08 ` [PATCH v3 8/9] t5521: test --dry-run does not make any changes Paul Tan
2015-05-13 9:08 ` [PATCH v3 9/9] t5520: check reflog action in fast-forward merge Paul Tan
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=xmqq617sfj05.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=blume.mike@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=pyokagan@gmail$(echo .)com \
--cc=sbeller@google$(echo .)com \
/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