From: Michael J Gruber Date: Thu, 15 Apr 2010 09:34:07 +0000 (+0200) Subject: t1010-mktree: Adjust expected result to code and documentation X-Git-Tag: v1.7.1-rc2~5^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=53b3c47d64b4294ae586d1daa04f9140dadd9ae6;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh index 9956e3ad6..b946f8768 100755 --- a/t/t1010-mktree.sh +++ b/t/t1010-mktree.sh @@ -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 actual && - test_cmp tree actual +test_expect_success 'mktree refuses to read ls-tree -r output (1)' ' + test_must_fail git mktree actual ' -test_expect_failure 'mktree reads ls-tree -r output (2)' ' - git mktree actual && - test_cmp tree.withsub actual +test_expect_success 'mktree refuses to read ls-tree -r output (2)' ' + test_must_fail git mktree actual ' test_done