Re: [PATCH 2/2] format-patch: don't include --stat with --range-diff output

2018-11-23 Thread Junio C Hamano
Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > >> if (rev->rdiff1) { >> +struct diff_options opts; >> +memcpy(&opts, &rev->diffopt, sizeof(opts)); >> +opts.output_format &= ~(DIFF_FORMAT_DIFFSTAT | >> DIFF_FORMAT_SUMMARY); >> + >>

Re: [PATCH 2/2] format-patch: don't include --stat with --range-diff output

2018-11-23 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > if (rev->rdiff1) { > + struct diff_options opts; > + memcpy(&opts, &rev->diffopt, sizeof(opts)); > + opts.output_format &= ~(DIFF_FORMAT_DIFFSTAT | > DIFF_FORMAT_SUMMARY); > + > fprintf_ln(rev->diffopt.fil

[PATCH 2/2] format-patch: don't include --stat with --range-diff output

2018-11-22 Thread Ævar Arnfjörð Bjarmason
Fix a regression introduced in my a48e12ef7a ("range-diff: make diff option behavior (e.g. --stat) consistent", 2018-11-13). Since the format-patch setup code implicitly sets --stat --summary by default, we started emitting the --stat output in the cover letter's range-diff. As noted in df569c3f31