Skip to content

Commit

Permalink
builtin-fast-export.c: turn error into warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Erik Faye-Lund authored and Junio C Hamano committed Mar 30, 2009
1 parent 41a5c70 commit 2d07f6d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions builtin-fast-export.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 2d07f6d

Please sign in to comment.