X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=6593a6920adcdb81fafad94ba2cf96431e6ceec9;hb=addafaf92eeb86033da91323d0d3ad7a496dae83;hp=99c580cf75ee15d6bbd65c588360309cc94e9dc4;hpb=ea726d02e9677a66586d7ffebe97f112ab6dab33;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index 99c580cf..6593a692 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -67,12 +67,13 @@ static int diff_root_tree(const unsigned char *new, const char *base)
 
 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);
@@ -89,9 +90,9 @@ static const char *generate_header(const unsigned char *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;
 }
 
@@ -110,7 +111,7 @@ static int diff_tree_commit(const unsigned char *commit_sha1)
 	
 	/* 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, "");
 	}
 
@@ -119,8 +120,7 @@ static int diff_tree_commit(const unsigned char *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);
@@ -129,9 +129,7 @@ static int diff_tree_commit(const unsigned char *commit_sha1)
 
 	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 ";