Merge branch 'pe/doc-email-env-is-trumped-by-config'

diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh
index 9956e3ad625eb1d70789538ecdb55e318669bdf9..df573c4978c9d6b665b56eeae7bc9997c7df4207 100755 (executable)
--- a/t/t1010-mktree.sh
+++ b/t/t1010-mktree.sh
@@ -42,13 +42,13 @@ test_expect_success 'ls-tree piped to mktree (2)' '
 '
 
 test_expect_success 'ls-tree output in wrong order given to mktree (1)' '
-       perl -e "print reverse <>" <top |
+       "$PERL_PATH" -e "print reverse <>" <top |
        git mktree >actual &&
        test_cmp tree actual
 '
 
 test_expect_success 'ls-tree output in wrong order given to mktree (2)' '
-       perl -e "print reverse <>" <top.withsub |
+       "$PERL_PATH" -e "print reverse <>" <top.withsub |
        git mktree >actual &&
        test_cmp tree.withsub actual
 '
@@ -58,14 +58,12 @@ test_expect_success 'allow missing object with --missing' '
        test_cmp tree.missing actual
 '
 
-test_expect_failure 'mktree reads ls-tree -r output (1)' '
-       git mktree <all >actual &&
-       test_cmp tree actual
+test_expect_success 'mktree refuses to read ls-tree -r output (1)' '
+       test_must_fail git mktree <all >actual
 '
 
-test_expect_failure 'mktree reads ls-tree -r output (2)' '
-       git mktree <all.withsub >actual &&
-       test_cmp tree.withsub actual
+test_expect_success 'mktree refuses to read ls-tree -r output (2)' '
+       test_must_fail git mktree <all.withsub >actual
 '
 
 test_done