diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 05:46:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 06:08:15 (GMT) |
| commit | 284aeb7e60314d16cf6880da9128295f1d3d49a8 (patch) | |
| tree | 6964049fb5b8d1e92a12ea8b5338bf328ed0370e /builtin | |
| parent | cae598d9980661a978e2df4fb338518f7bf09572 (diff) | |
| download | git-284aeb7e60314d16cf6880da9128295f1d3d49a8.zip git-284aeb7e60314d16cf6880da9128295f1d3d49a8.tar.gz git-284aeb7e60314d16cf6880da9128295f1d3d49a8.tar.bz2 | |
format-patch: respect --stat in cover letter's diffstat
Commit 43662b23ab (format-patch: keep cover-letter diffstat wrapped in
72 columns - 2018-01-24) uncondtionally sets stat width to 72 when
generating diffstat for the cover letter, ignoring --stat from command
line. But it should only do so when stat width is still default
(i.e. stat_width == 0).
In order to fix this, we should only set stat_width if stat_width is
zero. But it will never be. Commit 071dd0ba43 (format-patch: reduce
patch diffstat width to 72 - 2018-02-01) makes sure that default stat
width will be 72 (ignoring $COLUMNS, but could still be overriden by
--stat). So all we need to do here is drop the assignment.
Reported-by: Laszlo Ersek <lersek@redhat.com>
Helped-by: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index e094560..e0ae6aa 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1069,8 +1069,6 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, memcpy(&opts, &rev->diffopt, sizeof(opts)); opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT; - opts.stat_width = MAIL_DEFAULT_WRAP; - diff_setup_done(&opts); diff_tree_oid(get_commit_tree_oid(origin), |