Merge branch 'nd/format-patch-cover-letter-stat-width'
"git format-patch --stat=<width>" can be used to specify the width used by the diffstat (shown in the cover letter). * nd/format-patch-cover-letter-stat-width: format-patch: respect --stat in cover letter's diffstat
This commit is contained in:
commit
dc7accd755
@ -1011,8 +1011,6 @@ 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;
|
||||
|
||||
diff_setup_done(&opts);
|
||||
|
||||
diff_tree_oid(get_commit_tree_oid(origin),
|
||||
|
@ -44,42 +44,50 @@ show --stat
|
||||
log -1 --stat
|
||||
EOF
|
||||
|
||||
while read cmd args
|
||||
cat >expect.60 <<-'EOF'
|
||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||
EOF
|
||||
cat >expect.6030 <<-'EOF'
|
||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||
EOF
|
||||
cat >expect2.60 <<-'EOF'
|
||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||
EOF
|
||||
cat >expect2.6030 <<-'EOF'
|
||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||
EOF
|
||||
while read expect cmd args
|
||||
do
|
||||
cat >expect <<-'EOF'
|
||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||
EOF
|
||||
test_expect_success "$cmd --stat=width: a long name is given more room when the bar is short" '
|
||||
git $cmd $args --stat=40 >output &&
|
||||
grep " | " output >actual &&
|
||||
test_cmp expect actual
|
||||
test_cmp $expect.60 actual
|
||||
'
|
||||
|
||||
test_expect_success "$cmd --stat-width=width with long name" '
|
||||
git $cmd $args --stat-width=40 >output &&
|
||||
grep " | " output >actual &&
|
||||
test_cmp expect actual
|
||||
test_cmp $expect.60 actual
|
||||
'
|
||||
|
||||
cat >expect <<-'EOF'
|
||||
...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +
|
||||
EOF
|
||||
test_expect_success "$cmd --stat=...,name-width with long name" '
|
||||
git $cmd $args --stat=60,30 >output &&
|
||||
grep " | " output >actual &&
|
||||
test_cmp expect actual
|
||||
test_cmp $expect.6030 actual
|
||||
'
|
||||
|
||||
test_expect_success "$cmd --stat-name-width with long name" '
|
||||
git $cmd $args --stat-name-width=30 >output &&
|
||||
grep " | " output >actual &&
|
||||
test_cmp expect actual
|
||||
test_cmp $expect.6030 actual
|
||||
'
|
||||
done <<\EOF
|
||||
format-patch -1 --stdout
|
||||
diff HEAD^ HEAD --stat
|
||||
show --stat
|
||||
log -1 --stat
|
||||
expect2 format-patch --cover-letter -1 --stdout
|
||||
expect diff HEAD^ HEAD --stat
|
||||
expect show --stat
|
||||
expect log -1 --stat
|
||||
EOF
|
||||
|
||||
|
||||
@ -95,6 +103,16 @@ test_expect_success 'preparation for big change tests' '
|
||||
git commit -m message abcd
|
||||
'
|
||||
|
||||
cat >expect72 <<'EOF'
|
||||
abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
EOF
|
||||
test_expect_success "format-patch --cover-letter ignores COLUMNS (big change)" '
|
||||
COLUMNS=200 git format-patch -1 --stdout --cover-letter >output &&
|
||||
grep " | " output >actual &&
|
||||
test_cmp expect72 actual
|
||||
'
|
||||
|
||||
cat >expect72 <<'EOF'
|
||||
abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
EOF
|
||||
|
Loading…
Reference in New Issue
Block a user