diff options
Diffstat (limited to 'list-objects.c')
| -rw-r--r-- | list-objects.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/list-objects.c b/list-objects.c index 2910becd6c..11732d9388 100644 --- a/list-objects.c +++ b/list-objects.c @@ -81,10 +81,10 @@ 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_gently(tree, revs->ignore_missing_links) < 0) { if (revs->ignore_missing_links) return; - die("bad tree object %s", sha1_to_hex(obj->sha1)); + die("bad tree object %s", oid_to_hex(&obj->oid)); } obj->flags |= SEEN; show(obj, path, name, cb_data); @@ -157,7 +157,7 @@ void mark_edges_uninteresting(struct rev_info *revs, show_edge_fn show_edge) if (commit->object.flags & UNINTERESTING) { mark_tree_uninteresting(commit->tree); - if (revs->edge_hint && !(commit->object.flags & SHOWN)) { + if (revs->edge_hint_aggressive && !(commit->object.flags & SHOWN)) { commit->object.flags |= SHOWN; show_edge(commit); } @@ -165,7 +165,7 @@ void mark_edges_uninteresting(struct rev_info *revs, show_edge_fn show_edge) } mark_edge_parents_uninteresting(commit, revs, show_edge); } - if (revs->edge_hint) { + if (revs->edge_hint_aggressive) { for (i = 0; i < revs->cmdline.nr; i++) { struct object *obj = revs->cmdline.rev[i].item; struct commit *commit = (struct commit *)obj; @@ -229,7 +229,7 @@ void traverse_commit_list(struct rev_info *revs, continue; } die("unknown pending object %s (%s)", - sha1_to_hex(obj->sha1), name); + oid_to_hex(&obj->oid), name); } object_array_clear(&revs->pending); strbuf_release(&base); |