Michael J GruberThe 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> --- CC'ed to you, Junio, as the original test author, according to the new guidelines :)
t/t1010-mktree.sh | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
Show changes to t/t1010-mktree.sh +4 −6
diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh index 9956e3a..b946f87 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 <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
-- 1.7.1.rc1.248.gcefbb