diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:37:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:37:41 -0700 |
| commit | 0fb2c97c206958a13e8979187b7b3cc31d389126 (patch) | |
| tree | 83687d7743812157c37fd644127ba47844f441f3 /upload-pack.c | |
| parent | 11fbc0b1e1d5435f482af7bf391fd0d679955ba6 (diff) | |
| parent | 71d5f938910120275484aac0b2e1c27cdf8b5cf3 (diff) | |
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
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)) { |