diff options
| author | Lucian Poston <lucian.poston@gmail.com> | 2012-04-18 14:12:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-18 16:08:11 -0700 |
| commit | 678c5741118729dc9072182bd368e0a3402dd4f1 (patch) | |
| tree | 5137d5f232a213f9eeee1cafb73a5c41cb10f1e8 | |
| parent | da79161db6dcb0643ab805e5cf78d7e4e34ce993 (diff) | |
| download | git-678c5741118729dc9072182bd368e0a3402dd4f1.tar.gz git-678c5741118729dc9072182bd368e0a3402dd4f1.tar.xz | |
Prevent graph_width of stat width from falling below min
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>
| -rw-r--r-- | diff.c | 6 | ||||
| -rwxr-xr-x | t/t4052-stat-output.sh | 14 |
2 files changed, 12 insertions, 8 deletions
@@ -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; diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh index b8eec8fd2..ced32dbbc 100755 --- a/t/t4052-stat-output.sh +++ b/t/t4052-stat-output.sh @@ -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' |