From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 May 2013 21:20:30 +0000 (-0700)
Subject: Merge branch 'mh/fetch-into-shallow'
X-Git-Tag: v1.8.4-rc0~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=305e19bdc315f302b935d50abff4a1a405e14b71;p=git

Merge branch 'mh/fetch-into-shallow'

"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
---

305e19bdc315f302b935d50abff4a1a405e14b71