builtin-fast-export.c: fix crash on tagged trees

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index e9ee2c79ac0395fde30de329d181733d7be88d40..1ec459f057a5b282d09f6a9bc030ee5210e7cb38 100644 (file)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -375,11 +375,17 @@ static void get_tags_and_duplicates(struct object_array *pending,
                        case OBJ_BLOB:
                                handle_object(tag->object.sha1);
                                continue;
+                       default:
+                               warning("Tag points to object of unexpected type %s, skipping.",
+                                       typename(tag->object.type));
+                               continue;
                        }
                        break;
                default:
-                       die ("Unexpected object of type %s",
-                            typename(e->item->type));
+                       warning("%s: Unexpected object of type %s, skipping.",
+                               e->name,
+                               typename(e->item->type));
+                       continue;
                }
                if (commit->util)
                        /* more than one name for the same object */
@@ -514,6 +520,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 
        get_tags_and_duplicates(&revs.pending, &extra_refs);
 
+       revs.topo_order = 1;
        if (prepare_revision_walk(&revs))
                die("revision walk setup failed");
        revs.diffopt.format_callback = show_filemodify;