diff options
author | Mårten Kongstad <marten.kongstad@gmail.com> | 2015-03-02 16:05:39 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-02 11:31:27 -0800 |
commit | ab27389affc78a521fe44fc25518e1d11a4fc433 (patch) | |
tree | f4e2bd8937198745c42fa1083f6ea2d6c8a9ee01 /bulk-checkin.h | |
parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
download | tgif-ab27389affc78a521fe44fc25518e1d11a4fc433.tar.xz |
diff --shortstat --dirstat: remove duplicate output
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>
Diffstat (limited to 'bulk-checkin.h')
0 files changed, 0 insertions, 0 deletions