Output the graph columns at the end of the commit message

byang · gitster · commit 81bd1b2a96ec · 2010-05-31T18:00:21.000-07:00
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 &lt;struggleyb.nku@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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');
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,12 @@ int log_tree_diff_flush(struct rev_info *opt)`
`469`	`469`	`int pch = DIFF_FORMAT_DIFFSTAT \| DIFF_FORMAT_PATCH;`
`470`	`470`	`if ((pch & opt->diffopt.output_format) == pch)`
`471`	`471`	`printf("---");`
	`472`	`+ if (opt->diffopt.output_prefix) {`
	`473`	`+ struct strbuf *msg = NULL;`
	`474`	`+ msg = opt->diffopt.output_prefix(&opt->diffopt,`
	`475`	`+ opt->diffopt.output_prefix_data);`
	`476`	`+ fwrite(msg->buf, msg->len, 1, stdout);`
	`477`	`+ }`
`472`	`478`	`putchar('\n');`
`473`	`479`	`}`
`474`	`480`	`}`