From: Erik Faye-Lund Date: Mon, 23 Mar 2009 12:53:07 +0000 (+0000) Subject: builtin-fast-export.c: turn error into warning X-Git-Tag: v1.6.2.4~2^2~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/38124d8f3120b8e189760376b0a93cad6f3c475a?ds=inline;hp=--cc 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 Signed-off-by: Junio C Hamano --- 38124d8f3120b8e189760376b0a93cad6f3c475a diff --git a/builtin-fast-export.c b/builtin-fast-export.c index fdf4ae9ebd..8a6cf5e649 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -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 */