[PATCH 2/4] builtin-fast-export.c: turn error into warning
- From
Erik Faye-Lund <kusmabite@gmail.com>
- Date
- Mar 23, 2009, 12:53 UTC
- Message-ID
- <1237812789-1360-2-git-send-email-kusmabite@gmail.com>
- In-Reply-To
- <1237812789-1360-1-git-send-email-kusmabite@gmail.com>
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> --- 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 fdf4ae9..02bad1f 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 */
-- 1.6.2.1.225.g9a4a0.dirty