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

kusma · gitster · commit 2d07f6d4b728 · 2009-03-29T19:48:43.000-07:00
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 &lt;kusmabite@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -378,8 +378,10 @@ static void get_tags_and_duplicates(struct object_array *pending,`
`378`	`378`	`}`
`379`	`379`	`break;`
`380`	`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;`
`383`	`385`	`}`
`384`	`386`	`if (commit->util)`
`385`	`387`	`/* more than one name for the same object */`