From: Jonathan Chang <ttjtftx@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Jonathan Chang <ttjtftx@gmail.com>,
Christian Couder <christian.couder@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Thomas Gummerer <t.gummerer@gmail.com>
Subject: [GSoC][PATCH v3 3/3] t0000: use test_line_count instead of wc -l
Date: Sun, 17 Mar 2019 23:23:38 +0800 [thread overview]
Message-ID: <bc3dee82a91592e50fd39c5a332b13b76fefa009.1552835153.git.ttjtftx@gmail.com> (raw)
In-Reply-To: <cover.1552835153.git.ttjtftx@gmail.com>
Signed-off-by: Jonathan Chang <ttjtftx@gmail.com>
---
t/t0000-basic.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 47666b013e..3de13daabe 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -1136,8 +1136,8 @@ test_expect_success 'git commit-tree omits duplicated parent in a commit' '
parent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual | sort -u) &&
test "z$commit0" = "z$parent" &&
git show --pretty=raw $commit2 >actual &&
- numparent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual | wc -l) &&
- test $numparent = 1
+ sed -n -e "s/^parent //p" -e "/^author /q" actual >parents &&
+ test_line_count = 1 parents
'
test_expect_success 'update-index D/F conflict' '
@@ -1146,8 +1146,7 @@ test_expect_success 'update-index D/F conflict' '
mv tmp path2 &&
git update-index --add --replace path2 path0/file2 &&
git ls-files path0 >actual &&
- numpath0=$(wc -l <actual) &&
- test $numpath0 = 1
+ test_line_count = 1 actual
'
test_expect_success 'very long name in the index handled sanely' '
--
2.21.0
next prev parent reply other threads:[~2019-03-17 15:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-17 15:23 [GSoC][PATCH v3 0/3] Avoid using pipes Jonathan Chang
2019-03-17 15:23 ` [GSoC][PATCH v3 1/3] t0000: fix indentation Jonathan Chang
2019-03-17 15:23 ` [GSoC][PATCH v3 2/3] t0000: avoid using pipes Jonathan Chang
2019-03-17 16:47 ` Ævar Arnfjörð Bjarmason
2019-03-24 11:26 ` jonathan chang
2019-03-24 19:04 ` Ævar Arnfjörð Bjarmason
2019-03-17 15:23 ` Jonathan Chang [this message]
2019-03-17 16:48 ` [GSoC][PATCH v3 3/3] t0000: use test_line_count instead of wc -l Ævar Arnfjörð Bjarmason
2019-03-17 20:06 ` Thomas Gummerer
2019-03-18 7:36 ` Ævar Arnfjörð Bjarmason
2019-03-18 8:15 ` 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=bc3dee82a91592e50fd39c5a332b13b76fefa009.1552835153.git.ttjtftx@gmail.com \
--to=ttjtftx@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
--cc=t.gummerer@gmail.com \
/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).