diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-11-15 23:59:52 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-17 18:43:51 +0900 |
| commit | cd13762d8f837b6339b7d9f3090c0de44d3e01aa (patch) | |
| tree | f1e0061321aa3f8fe3bba58c59769547a57bfc0e /builtin/fast-export.c | |
| parent | fast-export: move commit rewriting logic into a function for reuse (diff) | |
| download | tgif-cd13762d8f837b6339b7d9f3090c0de44d3e01aa.tar.xz | |
fast-export: when using paths, avoid corrupt stream with non-existent mark
If file paths are specified to fast-export and multiple refs point to a
commit that does not touch any of the relevant file paths, then
fast-export can hit problems. fast-export has a list of additional refs
that it needs to explicitly set after exporting all blobs and commits,
and when it tries to get_object_mark() on the relevant commit, it can
get a mark of 0, i.e. "not found", because the commit in question did
not touch the relevant paths and thus was not exported. Trying to
import a stream with a mark corresponding to an unexported object will
cause fast-import to crash.
Avoid this problem by taking the commit the ref points to and finding an
ancestor of it that was exported, and make the ref point to that commit
instead.
Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fast-export.c')
| -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(); |