diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 4bd1356d50508efab81066e79abd7abcc1443627..1dfc01e8f009968ef5d6118bffed7818e736576c 100755 (executable)
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
? strlen(reencoded) : message
? strlen(message) : 0),
reencoded ? reencoded : message ? message : "");
? strlen(reencoded) : message
? strlen(message) : 0),
reencoded ? reencoded : message ? message : "");
- if (reencoded)
- free(reencoded);
+ free(reencoded);
for (i = 0, p = commit->parents; p; p = p->next) {
int mark = get_object_mark(&p->item->object);
for (i = 0, p = commit->parents; p; p = p->next) {
int mark = get_object_mark(&p->item->object);
continue;
if (i == 0)
printf("from :%d\n", mark);
continue;
if (i == 0)
printf("from :%d\n", mark);
- else if (i == 1)
- printf("merge :%d", mark);
else
else
- printf(" :%d", mark);
+ printf("merge :%d\n", mark);
i++;
}
i++;
}
- if (i > 1)
- printf("\n");
log_tree_diff_flush(rev);
rev->diffopt.output_format = saved_output_format;
log_tree_diff_flush(rev);
rev->diffopt.output_format = saved_output_format;
};
/* we handle encodings */
};
/* we handle encodings */
- git_config(git_default_config);
+ git_config(git_default_config, NULL);
init_revisions(&revs, prefix);
argc = setup_revisions(argc, argv, &revs, NULL);
init_revisions(&revs, prefix);
argc = setup_revisions(argc, argv, &revs, NULL);