From: Bo Yang <struggleyb.nku@gmail.com>
Date: Wed, 26 May 2010 07:08:03 +0000 (+0800)
Subject: Output the graph columns at the end of the commit message
X-Git-Tag: v1.7.2-rc0~44^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=81bd1b2a96ecc12dcc72fc2b22aa5b7691186685;p=git.git

Output the graph columns at the end of the commit message

There is an empty line between the commit message and the diff
output. Add the graph columns as prefix of this line.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/log-tree.c b/log-tree.c
index d3ae969f6..2e2be7c40 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -469,6 +469,12 @@ int log_tree_diff_flush(struct rev_info *opt)
 			int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
 			if ((pch & opt->diffopt.output_format) == pch)
 				printf("---");
+			if (opt->diffopt.output_prefix) {
+				struct strbuf *msg = NULL;
+				msg = opt->diffopt.output_prefix(&opt->diffopt,
+					opt->diffopt.output_prefix_data);
+				fwrite(msg->buf, msg->len, 1, stdout);
+			}
 			putchar('\n');
 		}
 	}