From: Lucian Poston <lucian.poston@gmail.com>
Date: Tue, 20 Mar 2012 08:05:34 +0000 (-0700)
Subject: log --graph: fix break in graph lines
X-Git-Tag: v1.7.10.1~5^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b18e97ceb938362c0be62997ba333d4ad36226e4;p=git.git

log --graph: fix break in graph lines

Output from "git log --graph --stat -p" broke the ancestry graph lines
with a single empty line between the diffstat and the patch.

Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff.c b/diff.c
index d922b77ae..7d5b7ecf1 100644
--- a/diff.c
+++ b/diff.c
@@ -4266,6 +4266,12 @@ void diff_flush(struct diff_options *options)
 
 	if (output_format & DIFF_FORMAT_PATCH) {
 		if (separator) {
+			if (options->output_prefix) {
+				struct strbuf *msg = NULL;
+				msg = options->output_prefix(options,
+					options->output_prefix_data);
+				fwrite(msg->buf, msg->len, 1, stdout);
+			}
 			putc(options->line_termination, options->file);
 			if (options->stat_sep) {
 				/* attach patch instead of inline */