Merge branch 'mh/fetch-into-shallow' into maint
commit0fb2c97c206958a13e8979187b7b3cc31d389126
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:37:41 +0000 (27 14:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:37:41 +0000 (27 14:37 -0700)
tree83687d7743812157c37fd644127ba47844f441f3
parent11fbc0b1e1d5435f482af7bf391fd0d679955ba6
parent71d5f938910120275484aac0b2e1c27cdf8b5cf3
Merge branch 'mh/fetch-into-shallow' into maint

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