Thread (1 message) 1 message, 1 author, 2018-07-25

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

From: Junio C Hamano <hidden>
Date: 2018-07-25 18:25:53

Eric Sunshine [off-list ref] writes:
On Mon, Jul 23, 2018 at 6:59 PM Stefan Beller [off-list ref] wrote:
quoted
On Sun, Jul 22, 2018 at 2:58 AM Eric Sunshine [off-list ref] wrote:
quoted
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?
It could be done that way, though it would be nice for Dscho's
range-diff series to land without another re-roll, and it looks like
I'll probably be re-rolling this series, anyhow, to move
show_interdiff() to diff-lib.c and to fix its signature. Junio could
manage it as a "squash", but that's probably more work for him than
for me to retain it in this series. *And*, this change _is_ required
for this series, whereas it doesn't really matter for Dscho's series,
even though it's an obvious "fix".

Anyhow, whichever way Junio and Dscho would like to play it is fine with me.
Having it at the beginning of your series (I consider 1-6/14 to be a
separate series, on top of which another series whose first change
is this 7/14 is builds upon) like you do here is probably fine.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help