X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.c;h=be459cac6946fffeba71301416dd9443c1d44eff;hb=698ce6f87e0d6db380f7306e190e8586da184577;hp=af5db0ec12817a259c8c4f4c1482aa90ace03f17;hpb=328b710d800dc3786fe2b8595e5553dc4a4af424;p=git.git

diff --git a/diff.c b/diff.c
index af5db0ec..be459cac 100644
--- a/diff.c
+++ b/diff.c
@@ -299,6 +299,7 @@ static void diffstat_consume(void *priv, char *line, unsigned long len)
 
 static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
 static const char minuses[]= "----------------------------------------------------------------------";
+const char mime_boundary_leader[] = "------------";
 
 static void show_stats(struct diffstat_t* data)
 {
@@ -1980,7 +1981,10 @@ void diff_flush(struct diff_options *options)
 		show_stats(diffstat);
 		free(diffstat);
 		diffstat = NULL;
-		putchar(options->line_termination);
+		if (options->stat_sep)
+			fputs(options->stat_sep, stdout);
+		else
+			putchar(options->line_termination);
 	}
 	for (i = 0; i < q->nr; i++) {
 		struct diff_filepair *p = q->queue[i];