[PATCH 07/12] t5520: replace test -{n,z} with test-lib functions

[Denton Liu]

Instead of using `test -n` or `test -z`, replace them respectively with
invocations of test_file_not_empty() and test_must_be_empty().

Signed-off-by: Denton Liu <liu.den...@gmail.com>
---
 t/t5520-pull.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 9452779f40..c7797b13e6 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -206,15 +206,18 @@ test_expect_success 'fail if the index has unresolved 
entries' '
        test_when_finished "git checkout -f copy && git branch -D third" &&
        test "$(cat file)" = file &&
        test_commit modified2 file &&
-       test -z "$(git ls-files -u)" &&
+       git ls-files -u >unmerged &&
+       test_must_be_empty unmerged &&
        test_must_fail git pull . second &&
-       test -n "$(git ls-files -u)" &&
+       git ls-files -u >unmerged &&
+       test_file_not_empty unmerged &&
        cp file expected &&
        test_must_fail git pull . second 2>err &&
        test_i18ngrep "Pulling is not possible because you have unmerged 
files." err &&
        test_cmp expected file &&
        git add file &&
-       test -z "$(git ls-files -u)" &&
+       git ls-files -u >unmerged &&
+       test_must_be_empty unmerged &&
        test_must_fail git pull . second 2>err &&
        test_i18ngrep "You have not concluded your merge" err &&
        test_cmp expected file
@@ -667,7 +670,8 @@ test_expect_success 'git pull --rebase detects upstreamed 
changes' '
        (
                cd dst &&
                git pull --rebase &&
-               test -z "$(git ls-files -u)"
+               git ls-files -u >untracked &&
+               test_must_be_empty untracked
        )
 '
 
-- 
2.23.0.897.g0a19638b1e