wincred: avoid overwriting configured variables
[gitweb.git] / builtin / fast-export.c
index ea55a245965bc8ad0e8e6d2241c7d8535d3b49a7..b8d8a3aaf9ee8294be9a78956a70b476d327ee05 100644 (file)
@@ -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);
        }