summaryrefslogtreecommitdiff
path: root/builtin/fast-export.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-05 20:54:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-05 20:54:01 (GMT)
commit5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7 (patch)
tree52523c896b1eb72ed8cddb52261b7f9a909b71f0 /builtin/fast-export.c
parentb2a0afd96a40d6cdbba96ac9735a7b489d8d563e (diff)
parent3c62183929080c17299d5b404eb092e3d53c161a (diff)
downloadgit-5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7.zip
git-5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7.tar.gz
git-5bb62059f21ebe8a38226f6fbe76f0f9b6ad65f7.tar.bz2
Merge branch 'jk/robustify-parse-commit'
* jk/robustify-parse-commit: checkout: do not die when leaving broken detached HEAD use parse_commit_or_die instead of custom message use parse_commit_or_die instead of segfaulting assume parse_commit checks for NULL commit assume parse_commit checks commit->object.parsed log_tree_diff: die when we fail to parse a commit
Diffstat (limited to 'builtin/fast-export.c')
-rw-r--r--builtin/fast-export.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 78250ea..ea63052 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -287,7 +287,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
rev->diffopt.output_format = DIFF_FORMAT_CALLBACK;
- parse_commit(commit);
+ parse_commit_or_die(commit);
author = strstr(commit->buffer, "\nauthor ");
if (!author)
die ("Could not find author in commit %s",
@@ -308,7 +308,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
if (commit->parents &&
get_object_mark(&commit->parents->item->object) != 0 &&
!full_tree) {
- parse_commit(commit->parents->item);
+ parse_commit_or_die(commit->parents->item);
diff_tree_sha1(commit->parents->item->tree->object.sha1,
commit->tree->object.sha1, "", &rev->diffopt);
}