Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  t5516: remove ambiguity test (1)
  Linked glossary from cvs-migration page
  write-tree: properly detect failure to write tree objects
This commit is contained in:
Junio C Hamano
2008-04-24 21:50:48 -07:00
4 changed files with 75 additions and 16 deletions

View File

@ -209,19 +209,7 @@ test_expect_success 'push with weak ambiguity (2)' '
'
test_expect_success 'push with ambiguity (1)' '
mk_test remotes/origin/master remotes/frotz/master &&
if git push testrepo master:master
then
echo "Oops, should have failed"
false
else
check_push_result $the_first_commit remotes/origin/master remotes/frotz/master
fi
'
test_expect_success 'push with ambiguity (2)' '
test_expect_success 'push with ambiguity' '
mk_test heads/frotz tags/frotz &&
if git push testrepo master:frotz