@matheusbsbs / matheus-bagliano / commits / 38124d8f31
Fork 0

builtin-fast-export.c: turn error into warning

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>

Erik Faye-Lund committed Mar 23, 2009 at 12:53 UTC 38124d8f3120b8e189760376b0a93cad6f3c475a
1 file changed +4 -2
builtin-fast-export.c
+4 -2
@@ -378,8 +378,10 @@ static void get_tags_and_duplicates(struct object_array *pending,
378 }
379 break;
380 default:
381 - die ("Unexpected object of type %s",
382 - typename(e->item->type));
381 + warning("%s: Unexpected object of type %s, skipping.",
382 + e->name,
383 + typename(e->item->type));
384 + continue;
385 }
386 if (commit->util)
387 /* more than one name for the same object */