Merge branch 'jk/reopen-tempfile-truncate' into maint

diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 596e269394dccd42e85228c3121f979f5a4bd658..94fcb4a78e661ae793eef54ae98b4821218b1e29 100755 (executable)
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -156,7 +156,7 @@ test_expect_success PERL 'commit --interactive gives cache-tree on partial commi
                return 44;
        }
        EOT
-       (echo p; echo 1; echo; echo s; echo n; echo y; echo q) |
+       test_write_lines p 1 "" s n y q |
        git commit --interactive -m foo &&
        test_cache_tree
 '
@@ -257,7 +257,7 @@ test_expect_success 'no phantom error when switching trees' '
        >newdir/one &&
        git add newdir/one &&
        git checkout 2>errors &&
-       ! test -s errors
+       test_must_be_empty errors
 '
 
 test_expect_success 'switching trees does not invalidate shared index' '