Skip to content

Commit 53b3c47

Browse files
Michael J Grubergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2179870 commit 53b3c47

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

t/t1010-mktree.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,12 @@ test_expect_success 'allow missing object with --missing' '
5858
test_cmp tree.missing actual
5959
'
6060

61-
test_expect_failure 'mktree reads ls-tree -r output (1)' '
62-
git mktree <all >actual &&
63-
test_cmp tree actual
61+
test_expect_success 'mktree refuses to read ls-tree -r output (1)' '
62+
test_must_fail git mktree <all >actual
6463
'
6564

66-
test_expect_failure 'mktree reads ls-tree -r output (2)' '
67-
git mktree <all.withsub >actual &&
68-
test_cmp tree.withsub actual
65+
test_expect_success 'mktree refuses to read ls-tree -r output (2)' '
66+
test_must_fail git mktree <all.withsub >actual
6967
'
7068

7169
test_done

0 commit comments

Comments
 (0)