diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2010-04-15 11:34:07 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-04-17 10:30:00 -0700 |
| commit | 53b3c47d64b4294ae586d1daa04f9140dadd9ae6 (patch) | |
| tree | 91130b8557af5338b287753b7c2349796731e449 | |
| parent | combined diff: correctly handle truncated file (diff) | |
| download | tgif-53b3c47d64b4294ae586d1daa04f9140dadd9ae6.tar.xz | |
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-x | t/t1010-mktree.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t1010-mktree.sh b/t/t1010-mktree.sh index 9956e3ad62..b946f87686 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 |