t5520: use test_line_count where possible

Instead of rolling our own functionality to test the number of lines a
command outputs, use test_line_count() which provides better debugging
information in the case of a failure.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 7bb9031140dfc36d88246e6e3c69b16ef0fa9baf..0ca4867e9683fe84e3019324b7781d6bb9a3bedf 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -699,7 +699,8 @@ test_expect_success 'git pull --rebase does not reapply old patches' '
        (
                cd dst &&
                test_must_fail git pull --rebase &&
-               test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
+               find .git/rebase-apply -name "000*" >patches &&
+               test_line_count = 1 patches
        )
 '