Merge branch 'mh/fetch-into-shallow' into next
commita167d3e67985022ba4585108a4af4a951e5e7f54
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Apr 2013 17:46:21 +0000 (29 10:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Apr 2013 17:46:21 +0000 (29 10:46 -0700)
tree7e95c317530f6d6940af65234b2a9b5359e4d2e2
parent13eafc3433a155f3751b89f70106ebbf614bc743
parentaf04fa2a78af3f4dc07bdc3e3018ccf3baa88c20
Merge branch 'mh/fetch-into-shallow' into next

* mh/fetch-into-shallow:
  upload-pack: ignore 'shallow' lines with unknown obj-ids