diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fast-export.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 43e98a38a8..227488ae84 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -901,7 +901,18 @@ static void handle_tags_and_duplicates(void) if (anonymize) name = anonymize_refname(name); /* create refs pointing to already seen commits */ - commit = (struct commit *)object; + commit = rewrite_commit((struct commit *)object); + if (!commit) { + /* + * Neither this object nor any of its + * ancestors touch any relevant paths, so + * it has been filtered to nothing. Delete + * it. + */ + printf("reset %s\nfrom %s\n\n", + name, oid_to_hex(&null_oid)); + continue; + } printf("reset %s\nfrom :%d\n\n", name, get_object_mark(&commit->object)); show_progress(); |