summaryrefslogtreecommitdiff
path: root/t/t3600-rm.sh
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-11-27 19:53:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-29 21:20:14 (GMT)
commit0d913dfa7e41f31befb080512d2e8524338f1907 (patch)
treef25cc5ae00ae649be4f08be74ad353c0bb76080d /t/t3600-rm.sh
parent29a40b5a678fc9014063988ab74d34d156dfb385 (diff)
downloadgit-0d913dfa7e41f31befb080512d2e8524338f1907.zip
git-0d913dfa7e41f31befb080512d2e8524338f1907.tar.gz
git-0d913dfa7e41f31befb080512d2e8524338f1907.tar.bz2
t3600: use test_line_count() where possible
Since we have a helper function that can test the number of lines in a file that gives better debugging information on failure, use test_line_count() to test the number of lines. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-xt/t3600-rm.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 8c8cca5..f6e659b 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -113,9 +113,10 @@ test_expect_success '"rm" command printed' '
echo frotz >test-file &&
git add test-file &&
git commit -m "add file for rm test" &&
- git rm test-file >rm-output &&
- test $(grep "^rm " rm-output | wc -l) = 1 &&
- rm -f test-file rm-output &&
+ git rm test-file >rm-output.raw &&
+ grep "^rm " rm-output.raw >rm-output &&
+ test_line_count = 1 rm-output &&
+ rm -f test-file rm-output.raw rm-output &&
git commit -m "remove file from rm test"
'