diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-11-12 15:08:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-21 09:41:51 +0900 |
| commit | 3037d3db90c994cb3e5913a54f83acdefc219174 (patch) | |
| tree | c1957eb8823771bf7e5d4c20a6ba66c01dbe41a3 /t/t5520-pull.sh | |
| parent | 93a9bf876ba518464b12a5871965dc11df0012e4 (diff) | |
| download | git-3037d3db90c994cb3e5913a54f83acdefc219174.tar.gz | |
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>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 7bb9031140..0ca4867e96 100755 --- 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 ) ' |