diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2009-03-23 12:53:07 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-29 19:48:43 -0700 |
| commit | 2d07f6d4b728d19d115b89123224268718f34efd (patch) | |
| tree | 45c3f6c8c28c4b1a3ef808457c17da6f007e34a4 | |
| parent | 41a5c70f2caf5c22859574f0503afbdb3728a89c (diff) | |
| download | git-2d07f6d4b728d19d115b89123224268718f34efd.tar.gz git-2d07f6d4b728d19d115b89123224268718f34efd.tar.xz | |
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>
| -rw-r--r-- | builtin-fast-export.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c index fdf4ae9eb..8a6cf5e64 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 */ |