Merge branch 'mh/import-transport-fd-fix' into maint

diff --git a/list-objects.c b/list-objects.c
index bb7e61ef4bb9d1d48ca7840f87a301eff84f08e0..b5651ddd5bfdd6cda4047f71cc3cb66fc31a793d 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -374,6 +374,9 @@ static void do_traverse(struct traversal_context *ctx)
                        struct tree *tree = get_commit_tree(commit);
                        tree->object.flags |= NOT_USER_GIVEN;
                        add_pending_tree(ctx->revs, tree);
+               } else if (commit->object.parsed) {
+                       die(_("unable to load root tree for commit %s"),
+                             oid_to_hex(&commit->object.oid));
                }
                ctx->show_commit(commit, ctx->show_data);