From: Jonathan Chang Date: Sun, 10 Mar 2019 08:11:06 GMT Subject: [GSoC][PATCH v2 5/5] t0000-basic: use test_line_count instead of wc -l Message-ID: <20190310081106.64239-1-ttjtftx@gmail.com> In-Reply-To: <20190310081023.64186-1-ttjtftx@gmail.com> Signed-off-by: Jonathan Chang diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 47666b013e..aa25694b45 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 | wc -l >numparent && + test_line_count = 1 numparent ' test_expect_success 'update-index D/F conflict' ' @@ -1146,8 +1146,8 @@ 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 numpath0 && + test_line_count = 1 numpath0 ' test_expect_success 'very long name in the index handled sanely' ' -- 2.21.0