Thread (29 messages) flat view 29 messages, 3 authors, 2018-07-25

Re: [PATCH 07/14] range-diff: respect diff_option.file rather than assuming 'stdout'

From: Stefan Beller <hidden>
Date: 2018-07-23 22:59:53

On Sun, Jul 22, 2018 at 2:58 AM Eric Sunshine [off-list ref] wrote:
The actual diffs output by range-diff respect diff_option.file, which
range-diff passes down the call-chain, thus are destination-agnostic.
However, output_pair_header() is hard-coded to emit to 'stdout'. Fix
this by making output_pair_header() respect diff_option.file, as well.

Signed-off-by: Eric Sunshine <redacted>
Depending how much the range diff series has progressed
already, it might make sense to squash it there?

Thanks,
Stefan
quoted hunk ↗ jump to hunk
---
 range-diff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/range-diff.c b/range-diff.c
index 347b4a79f2..76e053c2b2 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -328,7 +328,7 @@ static void output_pair_header(struct diff_options *diffopt,
        }
        strbuf_addf(buf, "%s\n", color_reset);

-       fwrite(buf->buf, buf->len, 1, stdout);
+       fwrite(buf->buf, buf->len, 1, diffopt->file);
 }

 static struct userdiff_driver no_func_name = {
--
2.18.0.345.g5c9ce644c3
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help