mergetool: don't require a work tree for --tool-help

diff --git a/list-objects.c b/list-objects.c
index 206816fa9c47eb419775bcf2005f9cd5144bc297..3595ee7a22c4d6099ea9b995ffe1c61c60bb77cd 100644 (file)
--- 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;