diff --git a/diff-tree.c b/diff-tree.c
index 99c580cf75ee15d6bbd65c588360309cc94e9dc4..6593a6920adcdb81fafad94ba2cf96431e6ceec9 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
static const char *generate_header(const unsigned char *commit_sha1,
const unsigned char *parent_sha1,
- const char *msg)
+ const struct commit *commit)
{
static char this_header[16384];
int offset;
unsigned long len;
int abbrev = diff_options.abbrev;
+ const char *msg = commit->buffer;
if (!verbose_header)
return sha1_to_hex(commit_sha1);
: "root");
else
offset += sprintf(this_header + offset, "(from parents)\n");
- offset += pretty_print_commit(commit_format, msg, len,
+ offset += pretty_print_commit(commit_format, commit, len,
this_header + offset,
- sizeof(this_header) - offset);
+ sizeof(this_header) - offset, abbrev);
return this_header;
}
/* Root commit? */
if (show_root_diff && !commit->parents) {
- header = generate_header(sha1, NULL, commit->buffer);
+ header = generate_header(sha1, NULL, commit);
diff_root_tree(commit_sha1, "");
}
if (ignore_merges)
return 0;
else if (combine_merges) {
- header = generate_header(sha1, sha1,
- commit->buffer);
+ header = generate_header(sha1, sha1, commit);
return diff_tree_combined_merge(sha1, header,
show_empty_combined,
dense_combined_merges);
for (parents = commit->parents; parents; parents = parents->next) {
struct commit *parent = parents->item;
- header = generate_header(sha1,
- parent->object.sha1,
- commit->buffer);
+ header = generate_header(sha1, parent->object.sha1, commit);
diff_tree_sha1_top(parent->object.sha1, commit_sha1, "");
if (!header && verbose_header) {
header_prefix = "\ndiff-tree ";