[PATCH] format-patch: respect --stat when explicitly specified
- From
- Leif Lindholm <leif.lindholm@linaro.org>
- Date
- Nov 6, 2018, 10:48 UTC
- Message-ID
- <20181106104811.14625-1-leif.lindholm@linaro.org>
Commit 43662b23abbd ("format-patch: keep cover-letter diffstat wrapped in 72 columns") made format-patch keep the diffstat to within 72 characters. However, it does this even when --stat is explicitly set on the command line.
Make it possible to explicitly override the new mechanism, using --stat, matching the functionality before this change. This also matches the output in the case of non-cover-letter files.
Cc: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Cc: Junio C Hamano <gitster@pobox.com> Reported-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> ---
Note: In TianoCore we have LotsOfGloriousFilesNamedInReallyLongCamelCase, so our official submission guidelines specify the use of --stat.
builtin/log.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/log.c b/builtin/log.c index 061d4fd86..07e6ae2c1 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1009,7 +1009,8 @@ static void show_diffstat(struct rev_info *rev, memcpy(&opts, &rev->diffopt, sizeof(opts)); opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; - opts.stat_width = MAIL_DEFAULT_WRAP; + if (rev->diffopt.stat_width == -1) + opts.stat_width = MAIL_DEFAULT_WRAP; diff_setup_done(&opts);
-- 2.11.0