diff: write prefix to the correct file

johnkeeping · gitster · commit 3bf25c23cd68 · 2013-02-12T11:42:07.000-08:00
Write the prefix for an output line to the same file as the actual
content.

Signed-off-by: John Keeping &lt;john@keeping.me.uk&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diff.c b/diff.c
@@ -4483,7 +4483,7 @@ void diff_flush(struct diff_options *options)
 				struct strbuf *msg = NULL;
 				msg = options->output_prefix(options,
 					options->output_prefix_data);
-				fwrite(msg->buf, msg->len, 1, stdout);
+				fwrite(msg->buf, msg->len, 1, options->file);
 			}
 			putc(options->line_termination, options->file);
 			if (options->stat_sep) {

Original file line number	Diff line number	Diff line change
`@@ -4483,7 +4483,7 @@ void diff_flush(struct diff_options *options)`
`4483`	`4483`	`struct strbuf *msg = NULL;`
`4484`	`4484`	`msg = options->output_prefix(options,`
`4485`	`4485`	`options->output_prefix_data);`
`4486`		`- fwrite(msg->buf, msg->len, 1, stdout);`
	`4486`	`+ fwrite(msg->buf, msg->len, 1, options->file);`
`4487`	`4487`	`}`
`4488`	`4488`	`putc(options->line_termination, options->file);`
`4489`	`4489`	`if (options->stat_sep) {`