diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:53:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-02 13:53:28 -0700 |
commit | 29c2a3dbadaa1c2d1128a4892241f82f5b34778c (patch) | |
tree | e89235283655640030f481b6c8f5b6af77535650 /t/t4052-stat-output.sh | |
parent | a5f9ba99894f7e6e475bc7f8770c2098f2f73efb (diff) | |
parent | dc801e71a72201f760618c6a706a31edccdc6fd2 (diff) | |
download | git-29c2a3dbadaa1c2d1128a4892241f82f5b34778c.tar.gz git-29c2a3dbadaa1c2d1128a4892241f82f5b34778c.tar.xz |
Merge branch 'zj/diff-stat-smaller-num-columns'
Spend only minimum number of columns necessary to show the number of lines
in the output from "diff --stat", instead of always allocating 4 columns
even when showing changes that are much smaller than 1000 lines.
By Zbigniew Jędrzejewski-Szmek
* zj/diff-stat-smaller-num-columns:
diff --stat: use less columns for change counts
Diffstat (limited to 't/t4052-stat-output.sh')
-rwxr-xr-x | t/t4052-stat-output.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh index ddd94976c..b68afefa3 100755 --- a/t/t4052-stat-output.sh +++ b/t/t4052-stat-output.sh @@ -22,7 +22,7 @@ test_expect_success 'preparation' ' while read cmd args do cat >expect <<-'EOF' - ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 + + ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 + EOF test_expect_success "$cmd: small change with long name gives more space to the name" ' git $cmd $args >output && @@ -31,7 +31,7 @@ do ' cat >expect <<-'EOF' - ...aaaaaaaaaaaaaaaaaaaaaaaaaa | 1 + + ...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 && @@ -46,7 +46,7 @@ do ' cat >expect <<-'EOF' - ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 + + ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 + EOF test_expect_success "$cmd --stat=...,name-width with long name" ' git $cmd $args --stat=60,30 >output && |