[GSoC][PATCH v3 3/3] t0000: use test_line_count instead of wc -l
From: Jonathan Chang <hidden>
Date: 2019-03-17 15:24:27
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Jonathan Chang <redacted> --- 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