| commit | 305e19bdc315f302b935d50abff4a1a405e14b71 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 May 2013 21:20:30 +0000 (29 14:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 May 2013 21:20:30 +0000 (29 14:20 -0700) | ||
| tree | f835988777eb607a80e3d6c858829c65ec2d94ad | treesnapshot (tar.gz zip) |
| parent | 1ccb22d524e4809d5a8282603f0d5433cf2cbb8c | commitdiff |
| parent | 71d5f938910120275484aac0b2e1c27cdf8b5cf3 | commitdiff |
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
"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