summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2010-04-15 09:34:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-17 17:30:00 (GMT)
commit53b3c47d64b4294ae586d1daa04f9140dadd9ae6 (patch)
tree91130b8557af5338b287753b7c2349796731e449
parent21798708031ed808cb77232e771e20d3146cf9c8 (diff)
downloadgit-53b3c47d64b4294ae586d1daa04f9140dadd9ae6.zip
git-53b3c47d64b4294ae586d1daa04f9140dadd9ae6.tar.gz
git-53b3c47d64b4294ae586d1daa04f9140dadd9ae6.tar.bz2
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>
-rwxr-xr-xt/t1010-mktree.sh10
1 files changed, 4 insertions, 6 deletions
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