diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:20:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:20:30 -0700 |
| commit | 305e19bdc315f302b935d50abff4a1a405e14b71 (patch) | |
| tree | f835988777eb607a80e3d6c858829c65ec2d94ad /upload-pack.c | |
| parent | 1ccb22d524e4809d5a8282603f0d5433cf2cbb8c (diff) | |
| parent | 71d5f938910120275484aac0b2e1c27cdf8b5cf3 (diff) | |
| download | git-305e19bdc315f302b935d50abff4a1a405e14b71.tar.gz | |
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
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index bfa6279cc4..127e59a603 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -592,7 +592,7 @@ static void receive_needs(void) die("invalid shallow line: %s", line); object = parse_object(sha1); if (!object) - die("did not find object for %s", line); + continue; if (object->type != OBJ_COMMIT) die("invalid shallow object %s", sha1_to_hex(sha1)); if (!(object->flags & CLIENT_SHALLOW)) { |