diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index f171ee4a2beb3cfd6eec203f422799249508ee13..6cef8103127a8748acb64ca7ec7a7a95fb639cd3 100644 (file)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
if (message)
message += 2;
- if (commit->parents) {
+ if (commit->parents &&
+ get_object_mark(&commit->parents->item->object) != 0) {
parse_commit(commit->parents->item);
diff_tree_sha1(commit->parents->item->tree->object.sha1,
commit->tree->object.sha1, "", &rev->diffopt);
init_revisions(&revs, prefix);
argc = setup_revisions(argc, argv, &revs, NULL);
- argc = parse_options(argc, argv, options, fast_export_usage, 0);
+ argc = parse_options(argc, argv, prefix, options, fast_export_usage, 0);
if (argc > 1)
usage_with_options (fast_export_usage, options);