diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:33 -0700 |
| commit | 967f8c918465312cc6cc1bcbcfacafcf95152bd8 (patch) | |
| tree | 72882dba893944951e58755e1f7d6a753d555b98 /list-objects.c | |
| parent | d59c12d7ad39f942fc60578ba1e934822f40445b (diff) | |
| parent | 69e4b3426a608b4965c1cb0c6eab5252d880178b (diff) | |
| download | git-967f8c918465312cc6cc1bcbcfacafcf95152bd8.tar.gz | |
Merge branch 'jk/pack-bitmap'
* jk/pack-bitmap:
pack-objects: do not reuse packfiles without --delta-base-offset
add `ignore_missing_links` mode to revwalk
Diffstat (limited to 'list-objects.c')
| -rw-r--r-- | list-objects.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/list-objects.c b/list-objects.c index 206816fa9c..3595ee7a22 100644 --- a/list-objects.c +++ b/list-objects.c @@ -81,8 +81,11 @@ static void process_tree(struct rev_info *revs, die("bad tree object"); if (obj->flags & (UNINTERESTING | SEEN)) return; - if (parse_tree(tree) < 0) + if (parse_tree(tree) < 0) { + if (revs->ignore_missing_links) + return; die("bad tree object %s", sha1_to_hex(obj->sha1)); + } obj->flags |= SEEN; show(obj, path, name, cb_data); me.up = path; |