From: Junio C Hamano <gitster@pobox.com>
To: Mike Hommey <mh@glandium.org>
Cc: git@vger.kernel.org, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH v3 2/2] t/t8003-blame-corner-cases.sh: Use here documents
Date: Mon, 18 Jul 2016 11:52:12 -0700 [thread overview]
Message-ID: <xmqq7fcikcdf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160715232346.12176-2-mh@glandium.org> (Mike Hommey's message of "Sat, 16 Jul 2016 08:23:46 +0900")
Mike Hommey <mh@glandium.org> writes:
> Somehow, this test was using:
>
> {
> echo A
> echo B
> } > file
>
> block to feed file contents. This changes those to the form most common
> in git test scripts:
>
> cat >file <<-\EOF
> A
> B
> EOF
>
> Signed-off-by: Mike Hommey <mh@glandium.org>
> ---
It is not so strong a preference to ask you to re-roll, but for
future reference, I'd prefer to see this preparatory clean-up early
in the series, followed by the primary thing, IOW, I would have
liked more if the two patches were swapped.
Thanks. Will queue.
> t/t8003-blame-corner-cases.sh | 34 +++++++++++++++++-----------------
> 1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
> index eab2e28..e48370d 100755
> --- a/t/t8003-blame-corner-cases.sh
> +++ b/t/t8003-blame-corner-cases.sh
> @@ -41,12 +41,12 @@ test_expect_success setup '
> test_tick &&
> GIT_AUTHOR_NAME=Fourth git commit -m Fourth &&
>
> - {
> - echo ABC
> - echo DEF
> - echo XXXX
> - echo GHIJK
> - } >cow &&
> + cat >cow <<-\EOF &&
> + ABC
> + DEF
> + XXXX
> + GHIJK
> + EOF
> git add cow &&
> test_tick &&
> GIT_AUTHOR_NAME=Fifth git commit -m Fifth
> @@ -115,11 +115,11 @@ test_expect_success 'append with -C -C -C' '
> test_expect_success 'blame wholesale copy' '
>
> git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
> - {
> - echo mouse-Initial
> - echo mouse-Second
> - echo mouse-Third
> - } >expected &&
> + cat >expected <<-\EOF &&
> + mouse-Initial
> + mouse-Second
> + mouse-Third
> + EOF
> test_cmp expected current
>
> '
> @@ -127,12 +127,12 @@ test_expect_success 'blame wholesale copy' '
> test_expect_success 'blame wholesale copy and more' '
>
> git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
> - {
> - echo mouse-Initial
> - echo mouse-Second
> - echo cow-Fifth
> - echo mouse-Third
> - } >expected &&
> + cat >expected <<-\EOF &&
> + mouse-Initial
> + mouse-Second
> + cow-Fifth
> + mouse-Third
> + EOF
> test_cmp expected current
>
> '
prev parent reply other threads:[~2016-07-18 18:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 2:42 [PATCH] blame: Allow to blame paths freshly added to the index Mike Hommey
2016-07-15 10:45 ` Johannes Schindelin
2016-07-15 12:32 ` Mike Hommey
2016-07-15 12:37 ` Jeff King
2016-07-15 12:42 ` Mike Hommey
2016-07-15 12:55 ` [PATCH v2] " Mike Hommey
2016-07-15 15:28 ` Johannes Schindelin
2016-07-15 20:58 ` [PATCH] " Junio C Hamano
2016-07-15 21:14 ` Junio C Hamano
2016-07-15 23:16 ` Mike Hommey
2016-07-18 18:49 ` Junio C Hamano
2016-07-15 23:23 ` [PATCH v3 1/2] " Mike Hommey
2016-07-15 23:23 ` [PATCH v3 2/2] t/t8003-blame-corner-cases.sh: Use here documents Mike Hommey
2016-07-16 13:05 ` Johannes Schindelin
2016-07-18 18:52 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7fcikcdf.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=mh@glandium.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).