builtin-fast-export.c: turn error into warning
authorErik Faye-Lund <kusmabite@gmail.com>
Mon, 23 Mar 2009 12:53:07 +0000 (12:53 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Mar 2009 02:48:43 +0000 (19:48 -0700)
fast-import doesn't have a syntax to support tree-objects (and some other
object-types), so fast-export shouldn't handle them. However, aborting the
operation is a bit drastic. This patch turns the error into a warning instead.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-fast-export.c

index fdf4ae9..8a6cf5e 100644 (file)
@@ -378,8 +378,10 @@ static void get_tags_and_duplicates(struct object_array *pending,
                        }
                        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 */