undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent graph_width of stat width from falling below min

Browse Source 
Update tests in t4052 fixed by this change.

Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lucian Poston 2012-04-18 14:12:18 -07:00 committed by Junio C Hamano
parent da79161db6
commit 678c574111
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -1473,8 +1473,12 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
* Adjust adjustable widths not to exceed maximum width
*/
if (name_width + number_width + 6 + graph_width > width) {
if (graph_width > width * 3/8 - number_width - 6)
if (graph_width > width * 3/8 - number_width - 6) {
graph_width = width * 3/8 - number_width - 6;
if (graph_width < 6)
graph_width = 6;
}
if (options->stat_graph_width &&
graph_width > options->stat_graph_width)
graph_width = options->stat_graph_width;

14
t/t4052-stat-output.sh
View File

@ -290,9 +290,9 @@ EOF
cat >expect1-graph <<'EOF'
| ...aaaaaaa | 1000 ++++++
EOF
while read teststate verb expect cmd args
while read verb expect cmd args
do
test_expect_$teststate "$cmd $verb prefix greater than COLUMNS (big change)" '
test_expect_success "$cmd $verb prefix greater than COLUMNS (big change)" '
COLUMNS=1 git $cmd $args >output
grep " | " output >actual &&
test_cmp "$expect" actual
@ -300,16 +300,16 @@ do
test "$cmd" != diff || continue
test_expect_$teststate "$cmd --graph $verb prefix greater than COLUMNS (big change)" '
test_expect_success "$cmd --graph $verb prefix greater than COLUMNS (big change)" '
COLUMNS=1 git $cmd $args --graph >output
grep " | " output >actual &&
test_cmp "$expect-graph" actual
'
done <<\EOF
success ignores expect80 format-patch -1 --stdout
failure respects expect1 diff HEAD^ HEAD --stat
failure respects expect1 show --stat
failure respects expect1 log -1 --stat
ignores expect80 format-patch -1 --stdout
respects expect1 diff HEAD^ HEAD --stat
respects expect1 show --stat
respects expect1 log -1 --stat
EOF
cat >expect <<'EOF'