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>
This commit is contained in:
parent
41a5c70f2c
commit
2d07f6d4b7
@ -378,8 +378,10 @@ static void get_tags_and_duplicates(struct object_array *pending,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
die ("Unexpected object of type %s",
|
warning("%s: Unexpected object of type %s, skipping.",
|
||||||
typename(e->item->type));
|
e->name,
|
||||||
|
typename(e->item->type));
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
if (commit->util)
|
if (commit->util)
|
||||||
/* more than one name for the same object */
|
/* more than one name for the same object */
|
||||||
|
Loading…
Reference in New Issue
Block a user