t1010-mktree: Adjust expected result to code and documentation
The last two tests here were always supposed to fail in the sense that, according to code and documentation, mktree should read non-recursive ls-tree output, but not recursive one, and therefore explicitely refuses to deal with slashes. Adjust the test (must_fail) so that it succeeds when mktree dies on slashes. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Apr 15, 2010 at 11:34 UTC
53b3c47d64b4294ae586d1daa04f9140dadd9ae6
1 file changed
+4
-6
t/t1010-mktree.sh
+4
-6
@@ -58,14 +58,12 @@ test_expect_success 'allow missing object with --missing' '
58
test_cmp tree.missing actual
59
'
60
61
-test_expect_failure 'mktree reads ls-tree -r output (1)' '
62
- git mktree <all >actual &&
63
- test_cmp tree actual
61
+test_expect_success 'mktree refuses to read ls-tree -r output (1)' '
62
+ test_must_fail git mktree <all >actual
63
'
64
66
-test_expect_failure 'mktree reads ls-tree -r output (2)' '
67
- git mktree <all.withsub >actual &&
68
- test_cmp tree.withsub actual
65
+test_expect_success 'mktree refuses to read ls-tree -r output (2)' '
66
+ test_must_fail git mktree <all.withsub >actual
67
'
68
69
test_done