Revision 53b3c47d64b4294ae586d1daa04f9140dadd9ae6 authored by Michael J Gruber on 15 April 2010, 09:34:07 UTC, committed by Junio C Hamano on 17 April 2010, 17:30:00 UTC
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>
1 parent 2179870
t3202-show-branch-octopus.sh
#!/bin/sh
test_description='test show-branch with more than 8 heads'
. ./test-lib.sh
numbers="1 2 3 4 5 6 7 8 9 10"
test_expect_success 'setup' '
> file &&
git add file &&
test_tick &&
git commit -m initial &&
for i in $numbers
do
git checkout -b branch$i master &&
> file$i &&
git add file$i &&
test_tick &&
git commit -m branch$i || break
done
'
cat > expect << EOF
! [branch1] branch1
! [branch2] branch2
! [branch3] branch3
! [branch4] branch4
! [branch5] branch5
! [branch6] branch6
! [branch7] branch7
! [branch8] branch8
! [branch9] branch9
* [branch10] branch10
----------
* [branch10] branch10
+ [branch9] branch9
+ [branch8] branch8
+ [branch7] branch7
+ [branch6] branch6
+ [branch5] branch5
+ [branch4] branch4
+ [branch3] branch3
+ [branch2] branch2
+ [branch1] branch1
+++++++++* [branch10^] initial
EOF
test_expect_success 'show-branch with more than 8 branches' '
git show-branch $(for i in $numbers; do echo branch$i; done) > out &&
test_cmp expect out
'
test_expect_success 'show-branch with showbranch.default' '
for i in $numbers; do
git config --add showbranch.default branch$i
done &&
git show-branch >out &&
test_cmp expect out
'
test_done
Computing file changes ...
