summaryrefslogtreecommitdiff
path: root/builtin-fast-export.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin-fast-export.c')
-rw-r--r--builtin-fast-export.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index fdf4ae9ebd..34a419c38e 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -221,7 +221,8 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
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);