Merge branch 'xf/user-manual-markup' into maint

diff --git a/list-objects.c b/list-objects.c
index 2a139b6ced68809f3a324f493325ec62c3a44044..41736d23727e2ff246d7000ee74a47ce80ea189d 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -81,7 +81,7 @@ 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));