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>

Nguyễn Thái Ngọc Duy committed Nov 10, 2018 at 06:46 UTC 284aeb7e60314d16cf6880da9128295f1d3d49a8
2 files changed +33 -17
builtin/log.c
-2
@@ -1069,8 +1069,6 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
1069
1070 memcpy(&opts, &rev->diffopt, sizeof(opts));
1071 opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
1072 - opts.stat_width = MAIL_DEFAULT_WRAP;
1073 -
1072 diff_setup_done(&opts);
1073
1074 diff_tree_oid(get_commit_tree_oid(origin),
t/t4052-stat-output.sh
+33 -15
@@ -44,42 +44,50 @@ show --stat
44 log -1 --stat
45 EOF
46
47 -while read cmd args
47 +cat >expect.60 <<-'EOF'
48 + ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
49 +EOF
50 +cat >expect.6030 <<-'EOF'
51 + ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
52 +EOF
53 +cat >expect2.60 <<-'EOF'
54 + ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
55 + ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
56 +EOF
57 +cat >expect2.6030 <<-'EOF'
58 + ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
59 + ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
60 +EOF
61 +while read expect cmd args
62 do
49 - cat >expect <<-'EOF'
50 - ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
51 - EOF
63 test_expect_success "$cmd --stat=width: a long name is given more room when the bar is short" '
64 git $cmd $args --stat=40 >output &&
65 grep " | " output >actual &&
55 - test_cmp expect actual
66 + test_cmp $expect.60 actual
67 '
68
69 test_expect_success "$cmd --stat-width=width with long name" '
70 git $cmd $args --stat-width=40 >output &&
71 grep " | " output >actual &&
61 - test_cmp expect actual
72 + test_cmp $expect.60 actual
73 '
74
64 - cat >expect <<-'EOF'
65 - ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
66 - EOF
75 test_expect_success "$cmd --stat=...,name-width with long name" '
76 git $cmd $args --stat=60,30 >output &&
77 grep " | " output >actual &&
70 - test_cmp expect actual
78 + test_cmp $expect.6030 actual
79 '
80
81 test_expect_success "$cmd --stat-name-width with long name" '
82 git $cmd $args --stat-name-width=30 >output &&
83 grep " | " output >actual &&
76 - test_cmp expect actual
84 + test_cmp $expect.6030 actual
85 '
86 done <<\EOF
79 -format-patch -1 --stdout
80 -diff HEAD^ HEAD --stat
81 -show --stat
82 -log -1 --stat
87 +expect2 format-patch --cover-letter -1 --stdout
88 +expect diff HEAD^ HEAD --stat
89 +expect show --stat
90 +expect log -1 --stat
91 EOF
92
93
@@ -95,6 +103,16 @@ test_expect_success 'preparation for big change tests' '
103 git commit -m message abcd
104 '
105
106 +cat >expect72 <<'EOF'
107 + abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
108 + abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
109 +EOF
110 +test_expect_success "format-patch --cover-letter ignores COLUMNS (big change)" '
111 + COLUMNS=200 git format-patch -1 --stdout --cover-letter >output &&
112 + grep " | " output >actual &&
113 + test_cmp expect72 actual
114 +'
115 +
116 cat >expect72 <<'EOF'
117 abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
118 EOF