diff options
| author | Erik Faye-Lund <kusmabite@gmail.com> | 2009-03-23 12:53:07 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-19 12:29:26 -0700 |
| commit | 38124d8f3120b8e189760376b0a93cad6f3c475a (patch) | |
| tree | f9b65989cc5a58fc2dc4da16d7e6bd4d254dfb7a | |
| parent | 1092f6b3f8bcdad89169952f2922e1bfb7b23d33 (diff) | |
| download | git-38124d8f3120b8e189760376b0a93cad6f3c475a.tar.gz git-38124d8f3120b8e189760376b0a93cad6f3c475a.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 */ |