summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2179870)
raw | patch | inline | side by side (parent: 2179870)
author | Michael J Gruber <git@drmicha.warpmail.net> | |
Thu, 15 Apr 2010 09:34:07 +0000 (11:34 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 17 Apr 2010 17:30:00 +0000 (10:30 -0700) |
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>
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>
t/t1010-mktree.sh | patch | blob | history |
diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh
index 9956e3ad625eb1d70789538ecdb55e318669bdf9..b946f8768649dd76d8a175877c63d49244e00ffb 100755 (executable)
--- a/t/t1010-mktree.sh
+++ b/t/t1010-mktree.sh
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