Merge branch 'mh/fetch-into-shallow'
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 May 2013 21:20:30 +0000 (14:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 May 2013 21:20:30 +0000 (14:20 -0700)
"git fetch" into a shallow repository from a repository that does
not know about the shallow boundary commits (e.g. a different fork
from the repository the current shallow repository was cloned from)
did not work correctly.

* mh/fetch-into-shallow:
t5500: add test for fetching with an unknown 'shallow'
upload-pack: ignore 'shallow' lines with unknown obj-ids

Trivial merge