Revision ab27389affc78a521fe44fc25518e1d11a4fc433 authored by Mårten Kongstad on 02 March 2015, 15:05:39 UTC, committed by Junio C Hamano on 02 March 2015, 19:31:27 UTC
When --shortstat is used in conjunction with --dirstat=changes, git diff will
output the dirstat information twice: first as calculated by the 'lines'
algorithm, then as calculated by the 'changes' algorithm:

    $ git diff --dirstat=changes,10 --shortstat v2.2.0..v2.2.1
     23 files changed, 453 insertions(+), 54 deletions(-)
      33.5% Documentation/RelNotes/
      26.2% t/
      46.6% Documentation/RelNotes/
      16.6% t/

The same duplication happens for --shortstat together with --dirstat=files, but
not for --shortstat together with --dirstat=lines.

Limit output to only include one dirstat part, calculated as specified
by the --dirstat parameter. Also, add test for this.

Signed-off-by: Mårten Kongstad <marten.kongstad@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 282616c
History
File Mode Size
Git
.gitignore -rw-r--r-- 79 bytes
Git.pm -rw-r--r-- 43.7 KB
Makefile -rw-r--r-- 2.2 KB
Makefile.PL -rw-r--r-- 1.6 KB
private-Error.pm -rw-r--r-- 18.6 KB

back to top