Merge branch 'jk/tree-walk-overflow'

diff --git a/t/t9135-git-svn-moved-branch-empty-file.sh b/t/t9135-git-svn-moved-branch-empty-file.sh
index 93db45db7d69e460d7005815c19ccc63e916e50c..2f80b216fe35bdcd4e3169306a69e8ca594dccdb 100755 (executable)
--- a/t/t9135-git-svn-moved-branch-empty-file.sh
+++ b/t/t9135-git-svn-moved-branch-empty-file.sh
@@ -13,8 +13,7 @@ test_expect_success 'test that b1 exists and is empty' '
        (
                cd x &&
                git reset --hard origin/branch-c &&
-               test -f b1 &&
-               ! test -s b1
+               test_must_be_empty b1
        )
        '